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

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
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

View File

@ -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
#