From: Sergei Golubchik Date: April 17 2009 2:46pm Subject: bzr commit into mysql-6.0 branch (serg:2744) Bug#33731 List-Archive: http://lists.mysql.com/commits/72408 X-Bug: 33731 Message-Id: <20090417144638.19687.qmail@janus.mylan> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7884348831950610084==" --===============7884348831950610084== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #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; + --===============7884348831950610084== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/serg@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: serg@stripped # target_branch: file:///usr/home/serg/Abk/mysql/6.0-maria/ # testament_sha1: 29a938e9ce753854813d10130fd757317b6c16e4 # timestamp: 2009-04-17 16:46:38 +0200 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 6.0-maria/ # base_revision_id: serg@stripped # # Begin bundle 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 --===============7884348831950610084==--