diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-15 13:22:38 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-15 13:22:38 +0100 |
| commit | 6554d1ac1e18efdfe2d99f0d6707055001068449 (patch) | |
| tree | 4e88d08f43cb1e6e1f1d1a912b93c6f4919482e9 /mysql-test/r/mysqldump.result | |
| parent | 4e0cace23d0f0dd61c288dbeb6447d80b025a924 (diff) | |
| download | mariadb-git-6554d1ac1e18efdfe2d99f0d6707055001068449.tar.gz | |
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
Diffstat (limited to 'mysql-test/r/mysqldump.result')
| -rw-r--r-- | mysql-test/r/mysqldump.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 54c195900f4..4ac1dfc938f 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -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 # |