database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Update result file for mysql_upgrade as we have more tables that is checked in 5.1

Browse Source 
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
This commit is contained in:
unknown
2006-11-15 13:22:38 +01:00
parent 4e0cace23d
commit 6554d1ac1e
5 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mysql-test/r/mysql_upgrade.result
View File

@ -1,14 +1,19 @@
Run mysql_upgrade once Run mysql_upgrade once
cluster.binlog_index OK
mysql.columns_priv OK mysql.columns_priv OK
mysql.db OK mysql.db OK
mysql.event OK
mysql.func OK mysql.func OK
mysql.general_log OK
mysql.help_category OK mysql.help_category OK
mysql.help_keyword OK mysql.help_keyword OK
mysql.help_relation OK mysql.help_relation OK
mysql.help_topic OK mysql.help_topic OK
mysql.host OK mysql.host OK
mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.slow_log OK
mysql.tables_priv OK mysql.tables_priv OK
mysql.time_zone OK mysql.time_zone OK
mysql.time_zone_leap_second OK mysql.time_zone_leap_second OK
@ -46,6 +51,18 @@ mysql.user OK
1 1
1 1
1 1
@hadEventPriv :=1
1
1
1
1
1
@hadTriggerPriv :=1
1
1
1
1
1
Run it again - should say already completed Run it again - should say already completed
@hadGrantPriv:=1 @hadGrantPriv:=1
1 1
@ -77,17 +94,34 @@ Run it again - should say already completed
1 1
1 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 Force should run it regardless of wheter it's been run before
cluster.binlog_index OK
mysql.columns_priv OK mysql.columns_priv OK
mysql.db OK mysql.db OK
mysql.event OK
mysql.func OK mysql.func OK
mysql.general_log OK
mysql.help_category OK mysql.help_category OK
mysql.help_keyword OK mysql.help_keyword OK
mysql.help_relation OK mysql.help_relation OK
mysql.help_topic OK mysql.help_topic OK
mysql.host OK mysql.host OK
mysql.plugin OK
mysql.proc OK mysql.proc OK
mysql.procs_priv OK mysql.procs_priv OK
mysql.slow_log OK
mysql.tables_priv OK mysql.tables_priv OK
mysql.time_zone OK mysql.time_zone OK
mysql.time_zone_leap_second OK mysql.time_zone_leap_second OK
@ -125,3 +159,15 @@ mysql.user OK
1 1
1 1
1 1
@hadEventPriv :=1
1
1
1
1
1
@hadTriggerPriv :=1
1
1
1
1
1

1
mysql-test/r/mysqldump.result
View File

@ -3122,7 +3122,6 @@ revoke all privileges on mysqldump_myDB.* from myDB_User@localhost;
drop user myDB_User@localhost; drop user myDB_User@localhost;
drop database mysqldump_myDB; drop database mysqldump_myDB;
use test; use test;
# #
# BUG#13926: --order-by-primary fails if PKEY contains quote character # BUG#13926: --order-by-primary fails if PKEY contains quote character
# #

1
mysql-test/r/rpl_drop_db.result
View File

@ -31,7 +31,6 @@ use test;
select * from t1; select * from t1;
n n
1234 1234
DROP DATABASE mysqltest1;
stop slave; stop slave;
drop database mysqltest1; drop database mysqltest1;
drop database mysqltest1; drop database mysqltest1;

2
mysql-test/r/rpl_row_max_relay_size.result
View File

@ -16,6 +16,7 @@ reset slave;
# #
# Test 1 # Test 1
# #
set @my_max_binlog_size= @@global.max_binlog_size;
set global max_binlog_size=8192; set global max_binlog_size=8192;
set global max_relay_log_size=8192-1; set global max_relay_log_size=8192-1;
select @@global.max_relay_log_size; select @@global.max_relay_log_size;
@ -268,6 +269,7 @@ File master-bin.000002
Position 102 Position 102
Binlog_Do_DB <Binlog_Ignore_DB> Binlog_Do_DB <Binlog_Ignore_DB>
Binlog_Ignore_DB Binlog_Ignore_DB
set global max_binlog_size= @my_max_binlog_size;
# #
# End of 4.1 tests # End of 4.1 tests
# #

5
mysql-test/t/rpl_drop_db.test
View File

@ -46,11 +46,6 @@ show tables;
use test; use test;
select * from t1; select * from t1;
system rm $MYSQLTEST_VARDIR/master-data/mysqltest1/f1.txt;
connection master;
DROP DATABASE mysqltest1;
sync_slave_with_master;
#cleanup #cleanup
connection slave; connection slave;
stop slave; stop slave;