Change default phpMyAdmin table names from PMA_* to pma_*.

This commit is contained in:
Michal Čihař
2003-10-10 14:24:34 +00:00
parent a51d18f8e9
commit f1dd5266c1
5 changed files with 60 additions and 58 deletions

View File

@@ -9,6 +9,8 @@ $Source$
* libraries/export/sql.php3: Fix PMA_getTableContentOld (bug #820932). * libraries/export/sql.php3: Fix PMA_getTableContentOld (bug #820932).
* left.php3: Konqueror 3 and Opera 7 works with tree view (bug #820717). * left.php3: Konqueror 3 and Opera 7 works with tree view (bug #820717).
* scripts/create-release.sh: Generate MD5 sums (RFE #748415). * scripts/create-release.sh: Generate MD5 sums (RFE #748415).
* Documentation, config.inc.php3, scripts/create_tables.sql: Change
default phpMyAdmin table names from PMA_* to pma_*.
2003-10-07 Marc Delisle <lem9@users.sourceforge.net> 2003-10-07 Marc Delisle <lem9@users.sourceforge.net>
* lang/russian*: updated, thanks to Artyom Rabzonov * lang/russian*: updated, thanks to Artyom Rabzonov

View File

@@ -626,7 +626,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
<li>within this database create a table following this scheme: <li>within this database create a table following this scheme:
<br /> <br />
<tt> <tt>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `PMA_bookmark` (<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `pma_bookmark` (<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id int(11) DEFAULT '0' NOT NULL auto_increment,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id int(11) DEFAULT '0' NOT NULL auto_increment,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dbase varchar(255) NOT NULL,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dbase varchar(255) NOT NULL,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;user varchar(255) NOT NULL,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;user varchar(255) NOT NULL,<br />
@@ -689,7 +689,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
within this database create a table following this scheme: within this database create a table following this scheme:
<br /> <br />
<tt> <tt>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `PMA_relation` (<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `pma_relation` (<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`master_db` varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`master_db` varchar(64) NOT NULL default '',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`master_table` varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`master_table` varchar(64) NOT NULL default '',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`master_field` varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`master_field` varchar(64) NOT NULL default '',<br />
@@ -733,7 +733,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
<li>within this database create a table following this scheme: <li>within this database create a table following this scheme:
<br /> <br />
<tt> <tt>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `PMA_table_info` (<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `pma_table_info` (<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`db_name` varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`db_name` varchar(64) NOT NULL default '',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`table_name` varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`table_name` varchar(64) NOT NULL default '',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`display_field` varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`display_field` varchar(64) NOT NULL default '',<br />
@@ -778,7 +778,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
within this database create a table following this scheme: within this database create a table following this scheme:
<br /> <br />
<tt> <tt>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `PMA_table_coords` (<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `pma_table_coords` (<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`db_name` varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`db_name` varchar(64) NOT NULL default '',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`table_name` varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`table_name` varchar(64) NOT NULL default '',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`pdf_page_number` int NOT NULL default '0',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`pdf_page_number` int NOT NULL default '0',<br />
@@ -791,7 +791,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
<li> <li>
also within this database create:<br /> also within this database create:<br />
<tt> <tt>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `PMA_pdf_pages` (<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `pma_pdf_pages` (<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`db_name` varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`db_name` varchar(64) NOT NULL default '',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`page_nr` int(10) unsigned NOT NULL auto_increment,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`page_nr` int(10) unsigned NOT NULL auto_increment,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`page_descr` varchar(50) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`page_descr` varchar(50) NOT NULL default '',<br />
@@ -837,7 +837,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
within this database create a table following this scheme: within this database create a table following this scheme:
<br /> <br />
<tt> <tt>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `PMA_column_info` (<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `pma_column_info` (<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id int(5) unsigned NOT NULL auto_increment,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id int(5) unsigned NOT NULL auto_increment,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;db_name varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;db_name varchar(64) NOT NULL default '',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;table_name varchar(64) NOT NULL default '',<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;table_name varchar(64) NOT NULL default '',<br />
@@ -858,7 +858,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
<li> <li>
To update your PRE-2.5.0 Column_comments Table use this:<br /> To update your PRE-2.5.0 Column_comments Table use this:<br />
<tt> <tt>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ALTER TABLE `PMA_column_comments` <br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ALTER TABLE `pma_column_comments` <br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ADD `mimetype` VARCHAR( 255 ) NOT NULL ,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ADD `mimetype` VARCHAR( 255 ) NOT NULL ,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ADD `transformation` VARCHAR( 255 ) NOT NULL ,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ADD `transformation` VARCHAR( 255 ) NOT NULL ,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ADD `transformation_options` VARCHAR( 255 ) NOT NULL ;<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ADD `transformation_options` VARCHAR( 255 ) NOT NULL ;<br />
@@ -894,7 +894,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
within this database create a table following this scheme: within this database create a table following this scheme:
<br /> <br />
<tt> <tt>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `PMA_history` (<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CREATE TABLE `pma_history` (<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`username` VARCHAR( 64 ) NOT NULL ,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`username` VARCHAR( 64 ) NOT NULL ,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`db` VARCHAR( 64 ) NOT NULL ,<br /> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`db` VARCHAR( 64 ) NOT NULL ,<br />
@@ -3096,7 +3096,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
</h4> </h4>
<p> <p>
Here is an example with the tables persons, towns and countries, all Here is an example with the tables persons, towns and countries, all
located in the database mydb. If you don't have a <tt>PMA_relation</tt> located in the database mydb. If you don't have a <tt>pma_relation</tt>
table, create it as explained in the configuration section. Then create the table, create it as explained in the configuration section. Then create the
example tables: example tables:
<br /><br /> <br /><br />
@@ -3164,7 +3164,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
[6.7] How can I use the &quot;display field&quot; feature? [6.7] How can I use the &quot;display field&quot; feature?
</h4> </h4>
<p> <p>
Starting from the previous example, create the PMA_table_info as explained Starting from the previous example, create the pma_table_info as explained
in the configuration section, then browse your persons table, in the configuration section, then browse your persons table,
and move the mouse over a town code or country code. and move the mouse over a town code or country code.
<br /><br /> <br /><br />

View File

@@ -14,8 +14,8 @@
+ Version history: ChangeLog + Version history: ChangeLog
+ General notes: README + General notes: README
+ License: LICENSE + License: LICENSE
* Documentation version: $Id: Documentation.html,v 1.506 2003/10/01 * Documentation version: $Id: Documentation.html,v 1.507 2003/10/07
07:37:53 rabus Exp $ 09:48:35 nijel Exp $
Requirements Requirements
@@ -430,7 +430,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
+ set up "pmadb" as described above + set up "pmadb" as described above
+ within this database create a table following this scheme: + within this database create a table following this scheme:
CREATE TABLE `PMA_bookmark` ( CREATE TABLE `pma_bookmark` (
id int(11) DEFAULT '0' NOT NULL auto_increment, id int(11) DEFAULT '0' NOT NULL auto_increment,
dbase varchar(255) NOT NULL, dbase varchar(255) NOT NULL,
user varchar(255) NOT NULL, user varchar(255) NOT NULL,
@@ -466,7 +466,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
+ set up "pmadb" as described above + set up "pmadb" as described above
+ within this database create a table following this scheme: + within this database create a table following this scheme:
CREATE TABLE `PMA_relation` ( CREATE TABLE `pma_relation` (
`master_db` varchar(64) NOT NULL default '', `master_db` varchar(64) NOT NULL default '',
`master_table` varchar(64) NOT NULL default '', `master_table` varchar(64) NOT NULL default '',
`master_field` varchar(64) NOT NULL default '', `master_field` varchar(64) NOT NULL default '',
@@ -497,7 +497,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
+ set up "pmadb" as described above + set up "pmadb" as described above
+ within this database create a table following this scheme: + within this database create a table following this scheme:
CREATE TABLE `PMA_table_info` ( CREATE TABLE `pma_table_info` (
`db_name` varchar(64) NOT NULL default '', `db_name` varchar(64) NOT NULL default '',
`table_name` varchar(64) NOT NULL default '', `table_name` varchar(64) NOT NULL default '',
`display_field` varchar(64) NOT NULL default '', `display_field` varchar(64) NOT NULL default '',
@@ -525,7 +525,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
+ set up "pmadb" as described above + set up "pmadb" as described above
+ within this database create a table following this scheme: + within this database create a table following this scheme:
CREATE TABLE `PMA_table_coords` ( CREATE TABLE `pma_table_coords` (
`db_name` varchar(64) NOT NULL default '', `db_name` varchar(64) NOT NULL default '',
`table_name` varchar(64) NOT NULL default '', `table_name` varchar(64) NOT NULL default '',
`pdf_page_number` int NOT NULL default '0', `pdf_page_number` int NOT NULL default '0',
@@ -536,7 +536,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin ) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin
PDF output'; PDF output';
+ also within this database create: + also within this database create:
CREATE TABLE `PMA_pdf_pages` ( CREATE TABLE `pma_pdf_pages` (
`db_name` varchar(64) NOT NULL default '', `db_name` varchar(64) NOT NULL default '',
`page_nr` int(10) unsigned NOT NULL auto_increment, `page_nr` int(10) unsigned NOT NULL auto_increment,
`page_descr` varchar(50) NOT NULL default '', `page_descr` varchar(50) NOT NULL default '',
@@ -569,7 +569,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
+ set up "pmadb" as described above + set up "pmadb" as described above
+ within this database create a table following this scheme: + within this database create a table following this scheme:
CREATE TABLE `PMA_column_info` ( CREATE TABLE `pma_column_info` (
id int(5) unsigned NOT NULL auto_increment, id int(5) unsigned NOT NULL auto_increment,
db_name varchar(64) NOT NULL default '', db_name varchar(64) NOT NULL default '',
table_name varchar(64) NOT NULL default '', table_name varchar(64) NOT NULL default '',
@@ -584,7 +584,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
) TYPE=MyISAM COMMENT='Comments for Columns'; ) TYPE=MyISAM COMMENT='Comments for Columns';
+ put the table name in $cfg['Servers'][$i]['column_info'] + put the table name in $cfg['Servers'][$i]['column_info']
+ To update your PRE-2.5.0 Column_comments Table use this: + To update your PRE-2.5.0 Column_comments Table use this:
ALTER TABLE `PMA_column_comments` ALTER TABLE `pma_column_comments`
ADD `mimetype` VARCHAR( 255 ) NOT NULL , ADD `mimetype` VARCHAR( 255 ) NOT NULL ,
ADD `transformation` VARCHAR( 255 ) NOT NULL , ADD `transformation` VARCHAR( 255 ) NOT NULL ,
ADD `transformation_options` VARCHAR( 255 ) NOT NULL ; ADD `transformation_options` VARCHAR( 255 ) NOT NULL ;
@@ -608,7 +608,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
+ set up "pmadb" as described above + set up "pmadb" as described above
+ within this database create a table following this scheme: + within this database create a table following this scheme:
CREATE TABLE `PMA_history` ( CREATE TABLE `pma_history` (
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`username` VARCHAR( 64 ) NOT NULL , `username` VARCHAR( 64 ) NOT NULL ,
`db` VARCHAR( 64 ) NOT NULL , `db` VARCHAR( 64 ) NOT NULL ,
@@ -2135,7 +2135,7 @@ FAQ - Frequently Asked Questions
[6.6] How can I use the relation table in Query-by-example? [6.6] How can I use the relation table in Query-by-example?
Here is an example with the tables persons, towns and countries, all Here is an example with the tables persons, towns and countries, all
located in the database mydb. If you don't have a PMA_relation table, located in the database mydb. If you don't have a pma_relation table,
create it as explained in the configuration section. Then create the create it as explained in the configuration section. Then create the
example tables: example tables:
CREATE TABLE REL_countries ( CREATE TABLE REL_countries (
@@ -2183,7 +2183,7 @@ FAQ - Frequently Asked Questions
[6.7] How can I use the "display field" feature? [6.7] How can I use the "display field" feature?
Starting from the previous example, create the PMA_table_info as Starting from the previous example, create the pma_table_info as
explained in the configuration section, then browse your persons explained in the configuration section, then browse your persons
table, and move the mouse over a town code or country code. table, and move the mouse over a town code or country code.
See also FAQ 6.21 for an additionnal feature that "display field" See also FAQ 6.21 for an additionnal feature that "display field"

View File

@@ -93,26 +93,26 @@ $cfg['Servers'][$i]['pmadb'] = ''; // Database used for Relatio
// DEFAULT: 'phpmyadmin' // DEFAULT: 'phpmyadmin'
$cfg['Servers'][$i]['bookmarktable'] = ''; // Bookmark table $cfg['Servers'][$i]['bookmarktable'] = ''; // Bookmark table
// - leave blank for no bookmark support // - leave blank for no bookmark support
// DEFAULT: 'PMA_bookmark' // DEFAULT: 'pma_bookmark'
$cfg['Servers'][$i]['relation'] = ''; // table to describe the relation between links (see doc) $cfg['Servers'][$i]['relation'] = ''; // table to describe the relation between links (see doc)
// - leave blank for no relation-links support // - leave blank for no relation-links support
// DEFAULT: 'PMA_relation' // DEFAULT: 'pma_relation'
$cfg['Servers'][$i]['table_info'] = ''; // table to describe the display fields $cfg['Servers'][$i]['table_info'] = ''; // table to describe the display fields
// - leave blank for no display fields support // - leave blank for no display fields support
// DEFAULT: 'PMA_table_info' // DEFAULT: 'pma_table_info'
$cfg['Servers'][$i]['table_coords'] = ''; // table to describe the tables position for the PDF schema $cfg['Servers'][$i]['table_coords'] = ''; // table to describe the tables position for the PDF schema
// - leave blank for no PDF schema support // - leave blank for no PDF schema support
// DEFAULT: 'PMA_table_coords' // DEFAULT: 'pma_table_coords'
$cfg['Servers'][$i]['pdf_pages'] = ''; // table to describe pages of relationpdf $cfg['Servers'][$i]['pdf_pages'] = ''; // table to describe pages of relationpdf
// - leave blank if you don't want to use this // - leave blank if you don't want to use this
// DEFAULT: 'PMA_pdf_pages' // DEFAULT: 'pma_pdf_pages'
$cfg['Servers'][$i]['column_info'] = ''; // table to store column information $cfg['Servers'][$i]['column_info'] = ''; // table to store column information
// - leave blank for no column comments/mime types // - leave blank for no column comments/mime types
// DEFAULT: 'PMA_column_info' // DEFAULT: 'pma_column_info'
$cfg['Servers'][$i]['history'] = ''; // table to store SQL history $cfg['Servers'][$i]['history'] = ''; // table to store SQL history
// - leave blank for no SQL query history // - leave blank for no SQL query history
// DEFAULT: 'PMA_history' // DEFAULT: 'pma_history'
$cfg['Servers'][$i]['verbose_check'] = TRUE; // set to FALSE if you know that your PMA_* tables $cfg['Servers'][$i]['verbose_check'] = TRUE; // set to FALSE if you know that your pma_* tables
// are up to date. This prevents compatibility // are up to date. This prevents compatibility
// checks and thereby increases performance. // checks and thereby increases performance.
$cfg['Servers'][$i]['AllowDeny']['order'] // Host authentication order, leave blank to not use $cfg['Servers'][$i]['AllowDeny']['order'] // Host authentication order, leave blank to not use
@@ -135,13 +135,13 @@ $cfg['Servers'][$i]['password'] = '';
$cfg['Servers'][$i]['only_db'] = ''; $cfg['Servers'][$i]['only_db'] = '';
$cfg['Servers'][$i]['verbose'] = ''; $cfg['Servers'][$i]['verbose'] = '';
$cfg['Servers'][$i]['pmadb'] = ''; // 'phpmyadmin' - see scripts/create_tables.sql $cfg['Servers'][$i]['pmadb'] = ''; // 'phpmyadmin' - see scripts/create_tables.sql
$cfg['Servers'][$i]['bookmarktable'] = ''; // 'PMA_bookmark' $cfg['Servers'][$i]['bookmarktable'] = ''; // 'pma_bookmark'
$cfg['Servers'][$i]['relation'] = ''; // 'PMA_relation' $cfg['Servers'][$i]['relation'] = ''; // 'pma_relation'
$cfg['Servers'][$i]['table_info'] = ''; // 'PMA_table_info' $cfg['Servers'][$i]['table_info'] = ''; // 'pma_table_info'
$cfg['Servers'][$i]['table_coords'] = ''; // 'PMA_table_coords' $cfg['Servers'][$i]['table_coords'] = ''; // 'pma_table_coords'
$cfg['Servers'][$i]['pdf_pages'] = ''; // 'PMA_pdf_pages' $cfg['Servers'][$i]['pdf_pages'] = ''; // 'pma_pdf_pages'
$cfg['Servers'][$i]['column_info'] = ''; // 'PMA_column_info' $cfg['Servers'][$i]['column_info'] = ''; // 'pma_column_info'
$cfg['Servers'][$i]['history'] = ''; // 'PMA_history' $cfg['Servers'][$i]['history'] = ''; // 'pma_history'
$cfg['Servers'][$i]['verbose_check'] = TRUE; $cfg['Servers'][$i]['verbose_check'] = TRUE;
$cfg['Servers'][$i]['AllowDeny']['order'] $cfg['Servers'][$i]['AllowDeny']['order']
= ''; = '';
@@ -162,13 +162,13 @@ $cfg['Servers'][$i]['password'] = '';
$cfg['Servers'][$i]['only_db'] = ''; $cfg['Servers'][$i]['only_db'] = '';
$cfg['Servers'][$i]['verbose'] = ''; $cfg['Servers'][$i]['verbose'] = '';
$cfg['Servers'][$i]['pmadb'] = ''; // 'phpmyadmin' - see scripts/create_tables.sql $cfg['Servers'][$i]['pmadb'] = ''; // 'phpmyadmin' - see scripts/create_tables.sql
$cfg['Servers'][$i]['bookmarktable'] = ''; // 'PMA_bookmark' $cfg['Servers'][$i]['bookmarktable'] = ''; // 'pma_bookmark'
$cfg['Servers'][$i]['relation'] = ''; // 'PMA_relation' $cfg['Servers'][$i]['relation'] = ''; // 'pma_relation'
$cfg['Servers'][$i]['table_info'] = ''; // 'PMA_table_info' $cfg['Servers'][$i]['table_info'] = ''; // 'pma_table_info'
$cfg['Servers'][$i]['table_coords'] = ''; // 'PMA_table_coords' $cfg['Servers'][$i]['table_coords'] = ''; // 'pma_table_coords'
$cfg['Servers'][$i]['pdf_pages'] = ''; // 'PMA_pdf_pages' $cfg['Servers'][$i]['pdf_pages'] = ''; // 'pma_pdf_pages'
$cfg['Servers'][$i]['column_info'] = ''; // 'PMA_column_info' $cfg['Servers'][$i]['column_info'] = ''; // 'pma_column_info'
$cfg['Servers'][$i]['history'] = ''; // 'PMA_history' $cfg['Servers'][$i]['history'] = ''; // 'pma_history'
$cfg['Servers'][$i]['verbose_check'] = TRUE; $cfg['Servers'][$i]['verbose_check'] = TRUE;
$cfg['Servers'][$i]['AllowDeny']['order'] $cfg['Servers'][$i]['AllowDeny']['order']
= ''; = '';

View File

@@ -27,8 +27,8 @@ USE phpmyadmin;
GRANT SELECT, INSERT, DELETE, UPDATE ON `phpmyadmin`.* TO GRANT SELECT, INSERT, DELETE, UPDATE ON `phpmyadmin`.* TO
'pma'@localhost; 'pma'@localhost;
DROP TABLE IF EXISTS `PMA_bookmark`; DROP TABLE IF EXISTS `pma_bookmark`;
CREATE TABLE `PMA_bookmark` ( CREATE TABLE `pma_bookmark` (
`id` int(11) DEFAULT '0' NOT NULL AUTO_INCREMENT, `id` int(11) DEFAULT '0' NOT NULL AUTO_INCREMENT,
`dbase` VARCHAR(255) NOT NULL, `dbase` VARCHAR(255) NOT NULL,
`user` VARCHAR(255) NOT NULL, `user` VARCHAR(255) NOT NULL,
@@ -37,8 +37,8 @@ CREATE TABLE `PMA_bookmark` (
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) TYPE=MyISAM COMMENT='Bookmarks'; ) TYPE=MyISAM COMMENT='Bookmarks';
DROP TABLE IF EXISTS `PMA_relation`; DROP TABLE IF EXISTS `pma_relation`;
CREATE TABLE `PMA_relation` ( CREATE TABLE `pma_relation` (
`master_db` VARCHAR(64) NOT NULL DEFAULT '', `master_db` VARCHAR(64) NOT NULL DEFAULT '',
`master_table` VARCHAR(64) NOT NULL DEFAULT '', `master_table` VARCHAR(64) NOT NULL DEFAULT '',
`master_field` VARCHAR(64) NOT NULL DEFAULT '', `master_field` VARCHAR(64) NOT NULL DEFAULT '',
@@ -49,16 +49,16 @@ CREATE TABLE `PMA_relation` (
KEY `foreign_field` (`foreign_db`, `foreign_table`) KEY `foreign_field` (`foreign_db`, `foreign_table`)
) TYPE=MyISAM COMMENT='Relation table'; ) TYPE=MyISAM COMMENT='Relation table';
DROP TABLE IF EXISTS `PMA_table_info`; DROP TABLE IF EXISTS `pma_table_info`;
CREATE TABLE `PMA_table_info` ( CREATE TABLE `pma_table_info` (
`db_name` VARCHAR(64) NOT NULL DEFAULT '', `db_name` VARCHAR(64) NOT NULL DEFAULT '',
`table_name` VARCHAR(64) NOT NULL DEFAULT '', `table_name` VARCHAR(64) NOT NULL DEFAULT '',
`display_field` VARCHAR(64) NOT NULL DEFAULT '', `display_field` VARCHAR(64) NOT NULL DEFAULT '',
PRIMARY KEY (`db_name`, `table_name`) PRIMARY KEY (`db_name`, `table_name`)
) TYPE=MyISAM COMMENT='Table information for phpMyAdmin'; ) TYPE=MyISAM COMMENT='Table information for phpMyAdmin';
DROP TABLE IF EXISTS `PMA_table_coords`; DROP TABLE IF EXISTS `pma_table_coords`;
CREATE TABLE `PMA_table_coords` ( CREATE TABLE `pma_table_coords` (
`db_name` VARCHAR(64) NOT NULL DEFAULT '', `db_name` VARCHAR(64) NOT NULL DEFAULT '',
`table_name` VARCHAR(64) NOT NULL DEFAULT '', `table_name` VARCHAR(64) NOT NULL DEFAULT '',
`pdf_page_number` INT NOT NULL DEFAULT '0', `pdf_page_number` INT NOT NULL DEFAULT '0',
@@ -67,8 +67,8 @@ CREATE TABLE `PMA_table_coords` (
PRIMARY KEY (`db_name`, `table_name`, `pdf_page_number`) PRIMARY KEY (`db_name`, `table_name`, `pdf_page_number`)
) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output'; ) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output';
DROP TABLE IF EXISTS `PMA_pdf_pages`; DROP TABLE IF EXISTS `pma_pdf_pages`;
CREATE TABLE `PMA_pdf_pages` ( CREATE TABLE `pma_pdf_pages` (
`db_name` VARCHAR(64) NOT NULL DEFAULT '', `db_name` VARCHAR(64) NOT NULL DEFAULT '',
`page_nr` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, `page_nr` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`page_descr` VARCHAR(50) NOT NULL DEFAULT '', `page_descr` VARCHAR(50) NOT NULL DEFAULT '',
@@ -76,8 +76,8 @@ CREATE TABLE `PMA_pdf_pages` (
KEY (`db_name`) KEY (`db_name`)
) TYPE=MyISAM COMMENT='PDF Relationpages for PMA'; ) TYPE=MyISAM COMMENT='PDF Relationpages for PMA';
DROP TABLE IF EXISTS `PMA_column_info`; DROP TABLE IF EXISTS `pma_column_info`;
CREATE TABLE `PMA_column_info` ( CREATE TABLE `pma_column_info` (
`id` INT(5) UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT(5) UNSIGNED NOT NULL AUTO_INCREMENT,
`db_name` VARCHAR(64) NOT NULL DEFAULT '', `db_name` VARCHAR(64) NOT NULL DEFAULT '',
`table_name` VARCHAR(64) NOT NULL DEFAULT '', `table_name` VARCHAR(64) NOT NULL DEFAULT '',
@@ -90,8 +90,8 @@ CREATE TABLE `PMA_column_info` (
UNIQUE KEY `db_name` (`db_name`, `table_name`, `column_name`) UNIQUE KEY `db_name` (`db_name`, `table_name`, `column_name`)
) TYPE=MyISAM COMMENT='Column Information for phpMyAdmin'; ) TYPE=MyISAM COMMENT='Column Information for phpMyAdmin';
DROP TABLE IF EXISTS `PMA_history`; DROP TABLE IF EXISTS `pma_history`;
CREATE TABLE `PMA_history` ( CREATE TABLE `pma_history` (
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`username` VARCHAR(64) NOT NULL, `username` VARCHAR(64) NOT NULL,
`db` VARCHAR(64) NOT NULL, `db` VARCHAR(64) NOT NULL,