• unknown's avatar
    Merge with 4.0 · 037b0a7b
    unknown authored
    BitKeeper/etc/logging_ok:
      auto-union
    mysql-test/r/outfile2.result:
      Merge rename: mysql-test/r/outfile.result -> mysql-test/r/outfile2.result
    myisam/mi_key.c:
      Auto merged
    mysql-test/r/alter_table.result:
      Auto merged
    mysql-test/r/auto_increment.result:
      Auto merged
    mysql-test/r/innodb.result:
      Auto merged
    mysql-test/t/auto_increment.test:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    sql/handler.h:
      Auto merged
    mysql-test/t/alter_table.test:
      Merge
    mysql-test/t/outfile.test:
      Merge
    sql/item_func.cc:
      Merge
    sql/share/czech/errmsg.txt:
      Merge
    sql/share/danish/errmsg.txt:
      Merge
    sql/share/dutch/errmsg.txt:
      Merge
    sql/share/english/errmsg.txt:
      Merge
    sql/share/estonian/errmsg.txt:
      Merge
    sql/share/french/errmsg.txt:
      Merge
    sql/share/german/errmsg.txt:
      Merge
    sql/share/greek/errmsg.txt:
      Merge
    sql/share/hungarian/errmsg.txt:
      Merge
    sql/share/italian/errmsg.txt:
      Merge
    sql/share/japanese/errmsg.txt:
      Merge
    sql/share/korean/errmsg.txt:
      Merge
    sql/share/norwegian-ny/errmsg.txt:
      Merge
    sql/share/norwegian/errmsg.txt:
      Merge
    sql/share/polish/errmsg.txt:
      Merge
    sql/share/portuguese/errmsg.txt:
      Merge
    sql/share/romanian/errmsg.txt:
      Merge
    sql/share/russian/errmsg.txt:
      Merge
    sql/share/slovak/errmsg.txt:
      Merge
    sql/share/spanish/errmsg.txt:
      Merge
    sql/share/swedish/errmsg.txt:
      Merge
    sql/share/ukrainian/errmsg.txt:
      Merge
    sql/sql_table.cc:
      Merge
    sql/sql_yacc.yy:
      Keep old
    sql/unireg.cc:
      Merge
    037b0a7b
handler.h 22.4 KB