Commit 6554d1ac authored by unknown's avatar unknown
Browse files

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:
  Update result file for mysql_upgrade
mysql-test/r/mysqldump.result:
  Merge error
mysql-test/r/rpl_drop_db.result:
  Merge error
mysql-test/r/rpl_row_max_relay_size.result:
  Merge error
mysql-test/t/rpl_drop_db.test:
  Merge error
parent 4e0cace2

mysql-test/r/mysql_upgrade.result

+46 −0
Original line number Diff line number Diff line 
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 OK 
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 completed 
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
@@ -125,3 +159,15 @@ mysql.user OK 
1

1

1

@hadEventPriv :=1

1

1

1

1

1

@hadTriggerPriv :=1

1

1

1

1

1

mysql-test/r/mysqldump.result

+0 −1
Original line number Diff line number Diff line
@@ -3122,7 +3122,6 @@ revoke all privileges on mysqldump_myDB.* from myDB_User@localhost; 
drop user myDB_User@localhost;

drop database mysqldump_myDB;

use test;



#

# BUG#13926: --order-by-primary fails if PKEY contains quote character

#

mysql-test/r/rpl_drop_db.result

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ use test; 
select * from t1;

n

1234

DROP DATABASE mysqltest1;

stop slave;

drop database mysqltest1;

drop database mysqltest1;

mysql-test/r/rpl_row_max_relay_size.result

+2 −0
Original line number Diff line number Diff line
@@ -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

#

mysql-test/t/rpl_drop_db.test

+0 −5
Original line number Diff line number Diff line
@@ -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;