• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 466701cd
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
    
    
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/lock_multi.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    mysql-test/include/mix1.inc:
      Merge 5.0 -> 5.1
    mysql-test/r/create.result:
      Merge 5.0 -> 5.1
    mysql-test/r/innodb_mysql.result:
      Merge 5.0 -> 5.1
    mysql-test/t/sp.test:
      Merge 5.0 -> 5.1
    466701cd
lock_multi.test 5.69 KB