• unknown's avatar
    Merge mysql.com:/home/mydev/mysql-4.0-bug5390 · cfbb8603
    unknown authored
    into  mysql.com:/home/mydev/mysql-4.1-bug5390
    
    
    sql/table.h:
      Auto merged
    mysql-test/r/lock.result:
      BUG#5390 - problems with merge tables
      Manual merge from 4.0.
    mysql-test/t/lock.test:
      BUG#5390 - problems with merge tables
      Manual merge from 4.0.
    sql/lock.cc:
      BUG#5390 - problems with merge tables
      Manual merge from 4.0.
    cfbb8603
table.h 9.48 KB