Skip to content

Commit

Permalink
Remove leftovers from Drizzle setup on demo server
Browse files Browse the repository at this point in the history
These partial configurations showed up as localhost and did not work.

Fixes phpmyadmin/phpmyadmin#12986

Signed-off-by: Michal Čihař <michal@cihar.com>
  • Loading branch information
nijel committed Feb 13, 2017
1 parent 311c770 commit 911135f
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 21 deletions.
2 changes: 0 additions & 2 deletions demo/php/config-config-mysql.inc.php
Expand Up @@ -4,6 +4,4 @@
$cfg['Servers'][1]['auth_type'] = 'config';
$cfg['Servers'][2]['extension'] = 'mysql';
$cfg['Servers'][2]['auth_type'] = 'config';
$cfg['Servers'][3]['extension'] = 'mysql';
$cfg['Servers'][3]['auth_type'] = 'config';
?>
15 changes: 0 additions & 15 deletions demo/php/config-config-nopmadb.inc.php
Expand Up @@ -6,8 +6,6 @@
$cfg['Servers'][1]['auth_type'] = 'config';
$cfg['Servers'][2]['extension'] = 'mysqli';
$cfg['Servers'][2]['auth_type'] = 'config';
$cfg['Servers'][3]['extension'] = 'mysqli';
$cfg['Servers'][3]['auth_type'] = 'config';


unset($cfg['Servers'][1]['bookmarktable']);
Expand All @@ -33,17 +31,4 @@
unset($cfg['Servers'][2]['controluser']);
unset($cfg['Servers'][2]['controlpass']);
unset($cfg['Servers'][2]['pmadb']);

unset($cfg['Servers'][3]['bookmarktable']);
unset($cfg['Servers'][3]['relation']);
unset($cfg['Servers'][3]['table_info']);
unset($cfg['Servers'][3]['table_coords']);
unset($cfg['Servers'][3]['pdf_pages']);
unset($cfg['Servers'][3]['column_info']);
unset($cfg['Servers'][3]['history']);
unset($cfg['Servers'][3]['designer_coords']);
unset($cfg['Servers'][3]['controluser']);
unset($cfg['Servers'][3]['controlpass']);
unset($cfg['Servers'][3]['pmadb']);

?>
2 changes: 0 additions & 2 deletions demo/php/config-config.inc.php
Expand Up @@ -4,6 +4,4 @@
$cfg['Servers'][1]['auth_type'] = 'config';
$cfg['Servers'][2]['extension'] = 'mysqli';
$cfg['Servers'][2]['auth_type'] = 'config';
$cfg['Servers'][3]['extension'] = 'mysqli';
$cfg['Servers'][3]['auth_type'] = 'config';
?>
2 changes: 0 additions & 2 deletions demo/php/config-cookie.inc.php
Expand Up @@ -4,6 +4,4 @@
$cfg['Servers'][1]['auth_type'] = 'cookie';
$cfg['Servers'][2]['extension'] = 'mysqli';
$cfg['Servers'][2]['auth_type'] = 'cookie';
$cfg['Servers'][3]['extension'] = 'mysqli';
$cfg['Servers'][3]['auth_type'] = 'cookie';
?>

0 comments on commit 911135f

Please sign in to comment.