bk commit into 5.1 tree (msvensson:1.2366)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-15 13:22:38+01:00, msvensson@neptunus.(none) +5 -0
  Update result file for mysql_upgrade as we have more tables that is checked in 5.1
  Fix merge errors

  mysql-test/r/mysql_upgrade.result@stripped, 2006-11-15 13:22:33+01:00, msvensson@neptunus.(none) +46 -0
    Update result file for mysql_upgrade

  mysql-test/r/mysqldump.result@stripped, 2006-11-15 13:22:33+01:00, msvensson@neptunus.(none) +0 -1
    Merge error

  mysql-test/r/rpl_drop_db.result@stripped, 2006-11-15 13:22:34+01:00, msvensson@neptunus.(none) +0 -1
    Merge error

  mysql-test/r/rpl_row_max_relay_size.result@stripped, 2006-11-15 13:22:34+01:00, msvensson@neptunus.(none) +2 -0
    Merge error

  mysql-test/t/rpl_drop_db.test@stripped, 2006-11-15 13:22:34+01:00, msvensson@neptunus.(none) +0 -5
    Merge error

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.4/mysql-test/r/rpl_row_max_relay_size.result	2006-11-15 13:22:46 +01:00
+++ 1.5/mysql-test/r/rpl_row_max_relay_size.result	2006-11-15 13:22:46 +01:00
@@ -16,6 +16,7 @@ reset slave;
 #
 # Test 1
 #
+set @my_max_binlog_size= @@global.max_binlog_size;
 set global max_binlog_size=8192;
 set global max_relay_log_size=8192-1;
 select @@global.max_relay_log_size;
@@ -268,6 +269,7 @@ File	master-bin.000002
 Position	102
 Binlog_Do_DB	<Binlog_Ignore_DB>
 Binlog_Ignore_DB	
+set global max_binlog_size= @my_max_binlog_size;
 #
 # End of 4.1 tests
 # 

--- 1.1/mysql-test/r/mysql_upgrade.result	2006-11-15 13:22:46 +01:00
+++ 1.2/mysql-test/r/mysql_upgrade.result	2006-11-15 13:22:46 +01:00
@@ -1,14 +1,19 @@
 Run mysql_upgrade once
+cluster.binlog_index                               OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
+mysql.event                                        OK
 mysql.func                                         OK
+mysql.general_log                                  OK
 mysql.help_category                                OK
 mysql.help_keyword                                 OK
 mysql.help_relation                                OK
 mysql.help_topic                                   OK
 mysql.host                                         OK
+mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
+mysql.slow_log                                     OK
 mysql.tables_priv                                  OK
 mysql.time_zone                                    OK
 mysql.time_zone_leap_second                        OK
@@ -46,6 +51,18 @@ mysql.user                              
 1
 1
 1
+@hadEventPriv :=1
+1
+1
+1
+1
+1
+@hadTriggerPriv :=1
+1
+1
+1
+1
+1
 Run it again - should say already completed
 @hadGrantPriv:=1
 1
@@ -77,17 +94,34 @@ Run it again - should say already comple
 1
 1
 1
+@hadEventPriv :=1
+1
+1
+1
+1
+1
+@hadTriggerPriv :=1
+1
+1
+1
+1
+1
 Force should run it regardless of wheter it's been run before
+cluster.binlog_index                               OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
+mysql.event                                        OK
 mysql.func                                         OK
+mysql.general_log                                  OK
 mysql.help_category                                OK
 mysql.help_keyword                                 OK
 mysql.help_relation                                OK
 mysql.help_topic                                   OK
 mysql.host                                         OK
+mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
+mysql.slow_log                                     OK
 mysql.tables_priv                                  OK
 mysql.time_zone                                    OK
 mysql.time_zone_leap_second                        OK
@@ -120,6 +154,18 @@ mysql.user                              
 1
 1
 @hadCreateUserPriv:=1
+1
+1
+1
+1
+1
+@hadEventPriv :=1
+1
+1
+1
+1
+1
+@hadTriggerPriv :=1
 1
 1
 1

--- 1.134/mysql-test/r/mysqldump.result	2006-11-15 13:22:46 +01:00
+++ 1.135/mysql-test/r/mysqldump.result	2006-11-15 13:22:46 +01:00
@@ -3122,7 +3122,6 @@ revoke all privileges on mysqldump_myDB.
 drop user myDB_User@localhost;
 drop database mysqldump_myDB;
 use test;
-
 #
 # BUG#13926: --order-by-primary fails if PKEY contains quote character
 #

--- 1.9/mysql-test/r/rpl_drop_db.result	2006-11-15 13:22:46 +01:00
+++ 1.10/mysql-test/r/rpl_drop_db.result	2006-11-15 13:22:46 +01:00
@@ -31,7 +31,6 @@ use test;
 select * from t1;
 n
 1234
-DROP DATABASE mysqltest1;
 stop slave;
 drop database mysqltest1;
 drop database mysqltest1;

--- 1.13/mysql-test/t/rpl_drop_db.test	2006-11-15 13:22:46 +01:00
+++ 1.14/mysql-test/t/rpl_drop_db.test	2006-11-15 13:22:46 +01:00
@@ -46,11 +46,6 @@ show tables;
 use test;
 select * from t1;
 
-system rm  $MYSQLTEST_VARDIR/master-data/mysqltest1/f1.txt;
-connection master;
-DROP DATABASE mysqltest1;
-sync_slave_with_master;
-
 #cleanup
 connection slave;
 stop slave;