[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1-2934-g12f1bb7

[Piotr Przybylski]

The branch, master has been updated
       via  12f1bb773e9b429ae9c559d92f7525c6a98b3eea (commit)
      from  095e0818b8d69722fceae3ad518b74d02b488ed0 (commit)


- Log -----------------------------------------------------------------
commit 12f1bb773e9b429ae9c559d92f7525c6a98b3eea
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Thu Jun 2 15:37:34 2011 +0200

    Restore 'DEFAULT CHARACTER SET utf8 COLLATE utf8_bin' for configuration storage tables

-----------------------------------------------------------------------

Summary of changes:
 scripts/create_tables.sql |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index b98a4e8..5db0de4 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -44,7 +44,8 @@ CREATE TABLE IF NOT EXISTS `pma_bookmark` (
   `query` text NOT NULL,
   PRIMARY KEY  (`id`)
 )
-  ENGINE=MyISAM COMMENT='Bookmarks';
+  ENGINE=MyISAM COMMENT='Bookmarks'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -64,7 +65,8 @@ 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';
+  ENGINE=MyISAM COMMENT='Column information for phpMyAdmin'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -82,7 +84,8 @@ CREATE TABLE IF NOT EXISTS `pma_history` (
   PRIMARY KEY  (`id`),
   KEY `username` (`username`,`db`,`table`,`timevalue`)
 )
-  ENGINE=MyISAM COMMENT='SQL history for phpMyAdmin';
+  ENGINE=MyISAM COMMENT='SQL history for phpMyAdmin'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -97,7 +100,8 @@ 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';
+  ENGINE=MyISAM COMMENT='PDF relation pages for phpMyAdmin'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -110,7 +114,8 @@ CREATE TABLE IF NOT EXISTS `pma_recent` (
   `tables` text NOT NULL,
   PRIMARY KEY (`username`)
 )
-  ENGINE=MyISAM COMMENT='Recently accessed tables';
+  ENGINE=MyISAM COMMENT='Recently accessed tables'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -125,7 +130,8 @@ CREATE TABLE IF NOT EXISTS `pma_table_uiprefs` (
   `prefs` text NOT NULL,
   PRIMARY KEY (`username`,`db_name`,`table_name`)
 )
-  ENGINE=MyISAM COMMENT='Tables'' UI preferences';
+  ENGINE=MyISAM COMMENT='Tables'' UI preferences'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -143,7 +149,8 @@ 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';
+  ENGINE=MyISAM COMMENT='Relation table'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -159,7 +166,8 @@ 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';
+  ENGINE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -173,7 +181,8 @@ 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';
+  ENGINE=MyISAM COMMENT='Table information for phpMyAdmin'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -190,7 +199,8 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` (
   `h` TINYINT,
   PRIMARY KEY (`db_name`,`table_name`)
 )
-  ENGINE=MyISAM COMMENT='Table coordinates for Designer';
+  ENGINE=MyISAM COMMENT='Table coordinates for Designer'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -211,7 +221,8 @@ 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';
+  ENGINE=MyISAM ROW_FORMAT=COMPACT COMMENT='Database changes tracking for phpMyAdmin'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
 
 -- --------------------------------------------------------
 
@@ -225,4 +236,5 @@ CREATE TABLE IF NOT EXISTS `pma_userconfig` (
   `config_data` text NOT NULL,
   PRIMARY KEY  (`username`)
 )
-  ENGINE=MyISAM COMMENT='User preferences storage for phpMyAdmin';
+  ENGINE=MyISAM COMMENT='User preferences storage for phpMyAdmin'
+  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;


hooks/post-receive
-- 
phpMyAdmin