unknown b95a067685 Merge trift2.:/MySQL/M50/clone-5.0 ...

into  trift2.:/MySQL/M51/tmp-5.1


client/mysql_upgrade.c:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Null merge: Socket name change of 5.0 does not apply here.
mysql-test/t/rpl_000015.test:
  SCCS merged

2006-12-21 12:18:28 +01:00

5.5 KiB

Raw Blame History

View Raw