unknown 6554d1ac1e 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

2006-11-15 13:22:38 +01:00

1.3 KiB

Raw Blame History

View Raw