From 3cede7cbac68c8b3c1831cd4bd970b13a9964d37 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 12 Jul 2013 06:45:00 -0400 Subject: [PATCH] bug #4015 Forcing a storage engine for configuration storage --- ChangeLog | 1 + examples/create_tables.sql | 24 ++++++++++++------------ examples/create_tables_drizzle.sql | 23 +++++++++++------------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea17415129..2601e92fd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #3960 NavigationBarIconic config not honored - bug #3985 Call to undefined function mb_detect_encoding - bug #4007 Analyze option not shown for InnoDB tables +- bug #4015 Forcing a storage engine for configuration storage 4.0.4.1 (2013-06-30) - [security] Global variables scope injection vulnerability (see PMASA-2013-7) diff --git a/examples/create_tables.sql b/examples/create_tables.sql index c3a62a20af..723334c776 100644 --- a/examples/create_tables.sql +++ b/examples/create_tables.sql @@ -44,7 +44,7 @@ CREATE TABLE IF NOT EXISTS `pma__bookmark` ( `query` text NOT NULL, PRIMARY KEY (`id`) ) - ENGINE=MyISAM COMMENT='Bookmarks' + COMMENT='Bookmarks' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `pma__column_info` ( PRIMARY KEY (`id`), UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) ) - ENGINE=MyISAM COMMENT='Column information for phpMyAdmin' + COMMENT='Column information for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -84,7 +84,7 @@ CREATE TABLE IF NOT EXISTS `pma__history` ( PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) ) - ENGINE=MyISAM COMMENT='SQL history for phpMyAdmin' + COMMENT='SQL history for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `pma__pdf_pages` ( PRIMARY KEY (`page_nr`), KEY `db_name` (`db_name`) ) - ENGINE=MyISAM COMMENT='PDF relation pages for phpMyAdmin' + COMMENT='PDF relation pages for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -114,7 +114,7 @@ CREATE TABLE IF NOT EXISTS `pma__recent` ( `tables` text NOT NULL, PRIMARY KEY (`username`) ) - ENGINE=MyISAM COMMENT='Recently accessed tables' + COMMENT='Recently accessed tables' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -131,7 +131,7 @@ CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` ( `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`username`,`db_name`,`table_name`) ) - ENGINE=MyISAM COMMENT='Tables'' UI preferences' + COMMENT='Tables'' UI preferences' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -150,7 +150,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' + COMMENT='Relation table' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -167,7 +167,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' + COMMENT='Table coordinates for phpMyAdmin PDF output' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -182,7 +182,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' + COMMENT='Table information for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -200,7 +200,7 @@ CREATE TABLE IF NOT EXISTS `pma__designer_coords` ( `h` TINYINT, PRIMARY KEY (`db_name`,`table_name`) ) - ENGINE=MyISAM COMMENT='Table coordinates for Designer' + COMMENT='Table coordinates for Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -222,7 +222,7 @@ CREATE TABLE IF NOT EXISTS `pma__tracking` ( `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' + COMMENT='Database changes tracking for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; -- -------------------------------------------------------- @@ -237,5 +237,5 @@ CREATE TABLE IF NOT EXISTS `pma__userconfig` ( `config_data` text NOT NULL, PRIMARY KEY (`username`) ) - ENGINE=MyISAM COMMENT='User preferences storage for phpMyAdmin' + COMMENT='User preferences storage for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; diff --git a/examples/create_tables_drizzle.sql b/examples/create_tables_drizzle.sql index 21c24ca2bc..92de90afec 100644 --- a/examples/create_tables_drizzle.sql +++ b/examples/create_tables_drizzle.sql @@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `pma__bookmark` ( `query` text NOT NULL, PRIMARY KEY (`id`) ) - ENGINE=InnoDB COMMENT='Bookmarks' + COMMENT='Bookmarks' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -52,7 +52,7 @@ CREATE TABLE IF NOT EXISTS `pma__column_info` ( PRIMARY KEY (`id`), UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) ) - ENGINE=InnoDB COMMENT='Column information for phpMyAdmin' + COMMENT='Column information for phpMyAdmin' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS `pma__history` ( PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) ) - ENGINE=InnoDB COMMENT='SQL history for phpMyAdmin' + COMMENT='SQL history for phpMyAdmin' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -87,7 +87,7 @@ CREATE TABLE IF NOT EXISTS `pma__pdf_pages` ( PRIMARY KEY (`page_nr`), KEY `db_name` (`db_name`) ) - ENGINE=InnoDB COMMENT='PDF relation pages for phpMyAdmin' + COMMENT='PDF relation pages for phpMyAdmin' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -101,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `pma__recent` ( `tables` text NOT NULL, PRIMARY KEY (`username`) ) - ENGINE=InnoDB COMMENT='Recently accessed tables' + COMMENT='Recently accessed tables' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -118,7 +118,7 @@ CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` ( `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`username`,`db_name`,`table_name`) ) - ENGINE=InnoDB COMMENT='Tables'' UI preferences' + COMMENT='Tables'' UI preferences' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -137,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `pma__relation` ( PRIMARY KEY (`master_db`,`master_table`,`master_field`), KEY `foreign_field` (`foreign_db`,`foreign_table`) ) - ENGINE=InnoDB COMMENT='Relation table' + COMMENT='Relation table' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `pma__table_coords` ( `y` float NOT NULL default '0', PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`) ) - ENGINE=InnoDB COMMENT='Table coordinates for phpMyAdmin PDF output' + COMMENT='Table coordinates for phpMyAdmin PDF output' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -169,7 +169,7 @@ CREATE TABLE IF NOT EXISTS `pma__table_info` ( `display_field` varchar(64) NOT NULL default '', PRIMARY KEY (`db_name`,`table_name`) ) - ENGINE=InnoDB COMMENT='Table information for phpMyAdmin' + COMMENT='Table information for phpMyAdmin' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -187,7 +187,7 @@ CREATE TABLE IF NOT EXISTS `pma__designer_coords` ( `h` INT, PRIMARY KEY (`db_name`,`table_name`) ) - ENGINE=InnoDB COMMENT='Table coordinates for Designer' + COMMENT='Table coordinates for Designer' COLLATE utf8_bin; -- -------------------------------------------------------- @@ -209,7 +209,6 @@ CREATE TABLE IF NOT EXISTS `pma__tracking` ( `tracking_active` int(1) NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) ) - ENGINE=InnoDB COLLATE utf8_bin; -- -------------------------------------------------------- @@ -224,5 +223,5 @@ CREATE TABLE IF NOT EXISTS `pma__userconfig` ( `config_data` text NOT NULL, PRIMARY KEY (`username`) ) - ENGINE=InnoDB COMMENT='User preferences storage for phpMyAdmin' + COMMENT='User preferences storage for phpMyAdmin' COLLATE utf8_bin; -- 2.11.4.GIT