• unknown's avatar
    Merge mysql.com:/home/mydev/mysql-5.0-amerge · 6bc99731
    unknown authored
    into  mysql.com:/home/mydev/mysql-5.1-amerge
    
    
    mysql-test/r/lock_multi.result:
      Auto merged
    mysql-test/r/merge.result:
      Auto merged
    mysql-test/t/merge.test:
      Auto merged
    mysql-test/t/lock_multi.test:
      Manual merge
    sql/ha_myisammrg.h:
      Manual merge
    6bc99731
merge.result 16.9 KB