Merge mysql.com:/home/jimw/my/mysql-4.1-7617

into mysql.com:/home/jimw/my/mysql-4.1-clean


scripts/mysql_create_system_tables.sh:
  Auto merged

mysql-test/r/system_mysql_db.result

@@ -21,18 +21,18 @@ db	CREATE TABLE `db` (
   `Host` char(60) collate utf8_bin NOT NULL default '',
   `Db` char(64) collate utf8_bin NOT NULL default '',
   `User` char(16) collate utf8_bin NOT NULL default '',
-  `Select_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Insert_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Update_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Delete_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Create_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Drop_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Grant_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `References_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Index_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Alter_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Create_tmp_table_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Lock_tables_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
+  `Select_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Insert_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Update_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Delete_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Drop_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Grant_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `References_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Index_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Alter_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_tmp_table_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Lock_tables_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
   PRIMARY KEY  (`Host`,`Db`,`User`),
   KEY `User` (`User`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges'
@@ -41,18 +41,18 @@ Table	Create Table
 host	CREATE TABLE `host` (
   `Host` char(60) collate utf8_bin NOT NULL default '',
   `Db` char(64) collate utf8_bin NOT NULL default '',
-  `Select_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Insert_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Update_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Delete_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Create_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Drop_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Grant_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `References_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Index_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Alter_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Create_tmp_table_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Lock_tables_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
+  `Select_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Insert_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Update_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Delete_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Drop_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Grant_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `References_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Index_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Alter_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_tmp_table_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Lock_tables_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
   PRIMARY KEY  (`Host`,`Db`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Host privileges;  Merged with database privileges'
 show create table user;
@@ -61,28 +61,28 @@ user	CREATE TABLE `user` (
   `Host` varchar(60) collate utf8_bin NOT NULL default '',
   `User` varchar(16) collate utf8_bin NOT NULL default '',
   `Password` varchar(41) collate utf8_bin NOT NULL default '',
-  `Select_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Insert_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Update_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Delete_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Create_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Drop_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Reload_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Shutdown_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Process_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `File_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Grant_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `References_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Index_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Alter_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Show_db_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Super_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Create_tmp_table_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Lock_tables_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Execute_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Repl_slave_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `Repl_client_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
-  `ssl_type` enum('','ANY','X509','SPECIFIED') collate utf8_bin NOT NULL default '',
+  `Select_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Insert_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Update_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Delete_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Drop_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Reload_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Shutdown_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Process_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `File_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Grant_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `References_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Index_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Alter_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Show_db_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Super_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_tmp_table_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Lock_tables_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Execute_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Repl_slave_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Repl_client_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `ssl_type` enum('','ANY','X509','SPECIFIED') character set utf8 NOT NULL default '',
   `ssl_cipher` blob NOT NULL,
   `x509_issuer` blob NOT NULL,
   `x509_subject` blob NOT NULL,
@@ -97,7 +97,7 @@ func	CREATE TABLE `func` (
   `name` char(64) collate utf8_bin NOT NULL default '',
   `ret` tinyint(1) NOT NULL default '0',
   `dl` char(128) collate utf8_bin NOT NULL default '',
-  `type` enum('function','aggregate') collate utf8_bin NOT NULL default 'function',
+  `type` enum('function','aggregate') character set utf8 NOT NULL default 'function',
   PRIMARY KEY  (`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User defined functions'
 show create table tables_priv;
@@ -109,8 +109,8 @@ tables_priv	CREATE TABLE `tables_priv` (
   `Table_name` char(64) collate utf8_bin NOT NULL default '',
   `Grantor` char(77) collate utf8_bin NOT NULL default '',
   `Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') collate utf8_bin NOT NULL default '',
-  `Column_priv` set('Select','Insert','Update','References') collate utf8_bin NOT NULL default '',
+  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') character set utf8 NOT NULL default '',
+  `Column_priv` set('Select','Insert','Update','References') character set utf8 NOT NULL default '',
   PRIMARY KEY  (`Host`,`Db`,`User`,`Table_name`),
   KEY `Grantor` (`Grantor`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Table privileges'
@@ -123,7 +123,7 @@ columns_priv	CREATE TABLE `columns_priv` (
   `Table_name` char(64) collate utf8_bin NOT NULL default '',
   `Column_name` char(64) collate utf8_bin NOT NULL default '',
   `Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  `Column_priv` set('Select','Insert','Update','References') collate utf8_bin NOT NULL default '',
+  `Column_priv` set('Select','Insert','Update','References') character set utf8 NOT NULL default '',
   PRIMARY KEY  (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Column privileges'
 show tables;