bzr commit into mysql-6.0 branch (serg:2744) Bug#33731

[Sergei Golubchik]

#At file:///usr/home/serg/Abk/mysql/6.0-maria/ based on revid:serg@stripped

 2744 Sergei Golubchik	2009-04-17
      Bug #33731 INSTALL/UNINSTALL PLUGIN: Inconsistent handling of identifier case
      fix the table definition to match the assumptions of the code
     @ scripts/mysql_system_tables.sql
        plugin names are compared case insensitive
     @ scripts/mysql_system_tables_fix.sql
        plugin names are compared case insensitive

    modified:
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_fix.sql
=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2009-03-18 21:09:40 +0000
+++ b/scripts/mysql_system_tables.sql	2009-04-17 14:46:18 +0000
@@ -22,7 +22,7 @@ set @had_user_table= @@warning_count != 
 CREATE TABLE IF NOT EXISTS func (  name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin   comment='User defined functions';
 
 
-CREATE TABLE IF NOT EXISTS plugin ( name char(64) binary DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='MySQL plugins';
+CREATE TABLE IF NOT EXISTS plugin ( name varchar(64) DEFAULT '' NOT NULL, dl varchar(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci comment='MySQL plugins';
 
 
 CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table';

=== modified file 'scripts/mysql_system_tables_fix.sql'
--- a/scripts/mysql_system_tables_fix.sql	2009-03-20 16:14:49 +0000
+++ b/scripts/mysql_system_tables_fix.sql	2009-04-17 14:46:18 +0000
@@ -255,9 +255,9 @@ SET GLOBAL slow_query_log = @old_log_sta
 #
 
 ALTER TABLE plugin
-  MODIFY name char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
-  MODIFY dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
-  CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+  MODIFY name varchar(64) COLLATE utf8_general_ci NOT NULL DEFAULT '',
+  MODIFY dl varchar(128) COLLATE utf8_general_ci NOT NULL DEFAULT '',
+  CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 #
 # Detect whether we had Create_view_priv
@@ -607,3 +607,4 @@ UPDATE user SET Create_tablespace_priv =
 flush privileges;
 
 ALTER TABLE backup_history ADD COLUMN backup_file_path VARCHAR (512) NOT NULL DEFAULT '' COMMENT 'The full path to the backup image file' AFTER backup_file;
+


Attachment: [text/bzr-bundle] bzr/[e-mail]