Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
a3c24963d2
@ -40,12 +40,11 @@ CREATE TABLE IF NOT EXISTS `pma_bookmark` (
|
||||
`id` int(11) NOT NULL auto_increment,
|
||||
`dbase` varchar(255) NOT NULL default '',
|
||||
`user` varchar(255) NOT NULL default '',
|
||||
`label` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default '',
|
||||
`label` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
|
||||
`query` text NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='Bookmarks'
|
||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='Bookmarks';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -58,15 +57,14 @@ CREATE TABLE IF NOT EXISTS `pma_column_info` (
|
||||
`db_name` varchar(64) NOT NULL default '',
|
||||
`table_name` varchar(64) NOT NULL default '',
|
||||
`column_name` varchar(64) NOT NULL default '',
|
||||
`comment` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default '',
|
||||
`mimetype` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default '',
|
||||
`comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
|
||||
`mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
|
||||
`transformation` varchar(255) NOT NULL default '',
|
||||
`transformation_options` varchar(255) NOT NULL default '',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='Column information for phpMyAdmin'
|
||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='Column information for phpMyAdmin';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -84,8 +82,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` (
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `username` (`username`,`db`,`table`,`timevalue`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='SQL history for phpMyAdmin'
|
||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='SQL history for phpMyAdmin';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -96,12 +93,11 @@ CREATE TABLE IF NOT EXISTS `pma_history` (
|
||||
CREATE TABLE IF NOT EXISTS `pma_pdf_pages` (
|
||||
`db_name` varchar(64) NOT NULL default '',
|
||||
`page_nr` int(10) unsigned NOT NULL auto_increment,
|
||||
`page_descr` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default '',
|
||||
`page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '',
|
||||
PRIMARY KEY (`page_nr`),
|
||||
KEY `db_name` (`db_name`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='PDF relation pages for phpMyAdmin'
|
||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='PDF relation pages for phpMyAdmin';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -110,12 +106,11 @@ CREATE TABLE IF NOT EXISTS `pma_pdf_pages` (
|
||||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `pma_recent` (
|
||||
`username` varchar(64) COLLATE utf8_bin NOT NULL,
|
||||
`tables` blob NOT NULL,
|
||||
`username` varchar(64) NOT NULL,
|
||||
`tables` text NOT NULL,
|
||||
PRIMARY KEY (`username`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='Recently accessed tables'
|
||||
DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='Recently accessed tables';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -124,14 +119,13 @@ CREATE TABLE IF NOT EXISTS `pma_recent` (
|
||||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `pma_table_uiprefs` (
|
||||
`username` varchar(64) COLLATE utf8_bin NOT NULL,
|
||||
`db_name` varchar(64) COLLATE utf8_bin NOT NULL,
|
||||
`table_name` varchar(64) COLLATE utf8_bin NOT NULL,
|
||||
`prefs` blob NOT NULL,
|
||||
`username` varchar(64) NOT NULL,
|
||||
`db_name` varchar(64) NOT NULL,
|
||||
`table_name` varchar(64) NOT NULL,
|
||||
`prefs` text NOT NULL,
|
||||
PRIMARY KEY (`username`,`db_name`,`table_name`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='Tables'' UI preferences'
|
||||
DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='Tables'' UI preferences';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -149,8 +143,7 @@ CREATE TABLE IF NOT EXISTS `pma_relation` (
|
||||
PRIMARY KEY (`master_db`,`master_table`,`master_field`),
|
||||
KEY `foreign_field` (`foreign_db`,`foreign_table`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='Relation table'
|
||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='Relation table';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -166,8 +159,7 @@ CREATE TABLE IF NOT EXISTS `pma_table_coords` (
|
||||
`y` float unsigned NOT NULL default '0',
|
||||
PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output'
|
||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -181,8 +173,7 @@ CREATE TABLE IF NOT EXISTS `pma_table_info` (
|
||||
`display_field` varchar(64) NOT NULL default '',
|
||||
PRIMARY KEY (`db_name`,`table_name`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='Table information for phpMyAdmin'
|
||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='Table information for phpMyAdmin';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -199,8 +190,7 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` (
|
||||
`h` TINYINT,
|
||||
PRIMARY KEY (`db_name`,`table_name`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='Table coordinates for Designer'
|
||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='Table coordinates for Designer';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -209,20 +199,19 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` (
|
||||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `pma_tracking` (
|
||||
`db_name` varchar(64) collate utf8_bin NOT NULL,
|
||||
`table_name` varchar(64) collate utf8_bin NOT NULL,
|
||||
`db_name` varchar(64) NOT NULL,
|
||||
`table_name` varchar(64) NOT NULL,
|
||||
`version` int(10) unsigned NOT NULL,
|
||||
`date_created` datetime NOT NULL,
|
||||
`date_updated` datetime NOT NULL,
|
||||
`schema_snapshot` text collate utf8_bin NOT NULL,
|
||||
`schema_sql` text collate utf8_bin,
|
||||
`data_sql` longtext collate utf8_bin,
|
||||
`tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') collate utf8_bin default NULL,
|
||||
`schema_snapshot` text NOT NULL,
|
||||
`schema_sql` text,
|
||||
`data_sql` longtext,
|
||||
`tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL,
|
||||
`tracking_active` int(1) unsigned NOT NULL default '1',
|
||||
PRIMARY KEY (`db_name`,`table_name`,`version`)
|
||||
)
|
||||
ENGINE=MyISAM ROW_FORMAT=COMPACT COMMENT='Database changes tracking for phpMyAdmin'
|
||||
DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
ENGINE=MyISAM ROW_FORMAT=COMPACT COMMENT='Database changes tracking for phpMyAdmin';
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
@ -236,5 +225,4 @@ CREATE TABLE IF NOT EXISTS `pma_userconfig` (
|
||||
`config_data` text NOT NULL,
|
||||
PRIMARY KEY (`username`)
|
||||
)
|
||||
ENGINE=MyISAM COMMENT='User preferences storage for phpMyAdmin'
|
||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
||||
ENGINE=MyISAM COMMENT='User preferences storage for phpMyAdmin';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user