• unknown's avatar
    Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines · 1335dd05
    unknown authored
    into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
    
    
    mysql-test/r/merge.result:
      Auto merged
    mysql-test/t/merge.test:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    storage/myisam/ha_myisam.cc:
      Auto merged
    storage/myisam/mi_create.c:
      Auto merged
    1335dd05
merge.test 15.2 KB