• unknown's avatar
    Merge mysql.com:/home/mydev/mysql-5.1 · 65e63068
    unknown authored
    into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
    
    
    mysql-test/r/create_select_tmp.result:
      Auto merged
    mysql-test/r/heap_hash.result:
      Auto merged
    mysql-test/r/innodb.result:
      Auto merged
    mysql-test/r/join_outer.result:
      Auto merged
    mysql-test/r/myisam.result:
      Auto merged
    mysql-test/r/ndb_index_unique.result:
      Auto merged
    mysql-test/r/rpl_loaddata.result:
      Auto merged
    mysql-test/r/sp-error.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/sp_trans.result:
      Auto merged
    mysql-test/r/type_bit.result:
      Auto merged
    mysql-test/r/type_varchar.result:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/share/errmsg.txt:
      Auto merged
    mysql-test/r/heap.result:
      WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
      Manual merge
    mysql-test/r/rpl_err_ignoredtable.result:
      WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
      Manual merge
    mysql-test/r/rpl_insert_id.result:
      WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
      Manual merge
    65e63068
errmsg.txt 346 KB