# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chuck.bell@oracle.com-20110205180142-4op2xkki4300qib8
# target_branch: file:///Users/cbell/source/bzr/mysql-5.5/
# testament_sha1: be067e835e8a452992e07d3774304cb0d1a30e65
# timestamp: 2011-02-05 13:03:25 -0500
# base_revision_id: georgi.kodinov@oracle.com-20110202181606-\
#   hi05so9jg3q05486
# 
# Begin patch
=== modified file 'mysql-test/r/system_mysql_db.result'
--- mysql-test/r/system_mysql_db.result	2010-12-17 11:11:34 +0000
+++ mysql-test/r/system_mysql_db.result	2011-02-05 18:01:42 +0000
@@ -120,7 +120,7 @@
   `max_updates` int(11) unsigned NOT NULL DEFAULT '0',
   `max_connections` int(11) unsigned NOT NULL DEFAULT '0',
   `max_user_connections` int(11) unsigned NOT NULL DEFAULT '0',
-  `plugin` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `plugin` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
   `authentication_string` text COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (`Host`,`User`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- mysql-test/suite/funcs_1/r/is_columns_mysql.result	2010-12-17 11:11:34 +0000
+++ mysql-test/suite/funcs_1/r/is_columns_mysql.result	2011-02-05 18:01:42 +0000
@@ -207,7 +207,7 @@
 def	mysql	user	max_updates	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 def	mysql	user	max_user_connections	40	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 def	mysql	user	Password	3		NO	char	41	41	NULL	NULL	latin1	latin1_bin	char(41)			select,insert,update,references	
-def	mysql	user	plugin	41		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references	
+def	mysql	user	plugin	41		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
 def	mysql	user	Process_priv	12	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 def	mysql	user	References_priv	15	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 def	mysql	user	Reload_priv	10	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -516,5 +516,5 @@
 NULL	mysql	user	max_updates	int	NULL	NULL	NULL	NULL	int(11) unsigned
 NULL	mysql	user	max_connections	int	NULL	NULL	NULL	NULL	int(11) unsigned
 NULL	mysql	user	max_user_connections	int	NULL	NULL	NULL	NULL	int(11) unsigned
-3.0000	mysql	user	plugin	char	60	180	utf8	utf8_bin	char(60)
+3.0000	mysql	user	plugin	char	64	192	utf8	utf8_bin	char(64)
 1.0000	mysql	user	authentication_string	text	65535	65535	utf8	utf8_bin	text

=== modified file 'scripts/mysql_system_tables.sql'
--- scripts/mysql_system_tables.sql	2010-12-29 00:26:31 +0000
+++ scripts/mysql_system_tables.sql	2011-02-05 18:01:42 +0000
@@ -28,7 +28,7 @@
 CREATE TABLE IF NOT EXISTS host (  Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Host privileges;  Merged with database privileges';
 
 
-CREATE TABLE IF NOT EXISTS user (   Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Reload_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Shutdown_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_db_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Super_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tablespace_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL, ssl_cipher BLOB NOT NULL, x509_issuer BLOB NOT NULL, x509_subject BLOB NOT NULL, max_questions int(11) unsigned DEFAULT 0  NOT NULL, max_updates int(11) unsigned DEFAULT 0  NOT NULL, max_connections int(11) unsigned DEFAULT 0  NOT NULL, max_user_connections int(11) unsigned DEFAULT 0  NOT NULL, plugin char(60) DEFAULT '' NOT NULL, authentication_string TEXT NOT NULL, PRIMARY KEY Host (Host,User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
+CREATE TABLE IF NOT EXISTS user (   Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Reload_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Shutdown_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_db_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Super_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tablespace_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL, ssl_cipher BLOB NOT NULL, x509_issuer BLOB NOT NULL, x509_subject BLOB NOT NULL, max_questions int(11) unsigned DEFAULT 0  NOT NULL, max_updates int(11) unsigned DEFAULT 0  NOT NULL, max_connections int(11) unsigned DEFAULT 0  NOT NULL, max_user_connections int(11) unsigned DEFAULT 0  NOT NULL, plugin char(64) DEFAULT '' NOT NULL, authentication_string TEXT NOT NULL, PRIMARY KEY Host (Host,User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
 
 -- Remember for later if user table already existed
 set @had_user_table= @@warning_count != 0;

=== modified file 'scripts/mysql_system_tables_fix.sql'
--- scripts/mysql_system_tables_fix.sql	2010-12-29 00:26:31 +0000
+++ scripts/mysql_system_tables_fix.sql	2011-02-05 18:01:42 +0000
@@ -640,8 +640,8 @@
 
 drop procedure mysql.die;
 
-ALTER TABLE user ADD plugin char(60) DEFAULT '' NOT NULL,  ADD authentication_string TEXT NOT NULL;
-ALTER TABLE user MODIFY plugin char(60) DEFAULT '' NOT NULL;
+ALTER TABLE user ADD plugin char(64) DEFAULT '' NOT NULL,  ADD authentication_string TEXT NOT NULL;
+ALTER TABLE user MODIFY plugin char(64) DEFAULT '' NOT NULL;
 
 -- Need to pre-fill mysql.proxies_priv with access for root even when upgrading from
 -- older versions

# Begin bundle
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
2lJgfxdyRThQkHfMBq4=