• unknown's avatar
    merge · 063df98f
    unknown authored
    
    BitKeeper/etc/logging_ok:
      auto-union
    acinclude.m4:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    sql/share/french/errmsg.txt:
      Auto merged
    sql/share/german/errmsg.txt:
      Auto merged
    sql/share/romanian/errmsg.txt:
      Auto merged
    sql/share/ukrainian/errmsg.txt:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/share/czech/errmsg.txt:
      Auto merged
    sql/share/danish/errmsg.txt:
      Auto merged
    sql/share/english/errmsg.txt:
      Auto merged
    sql/share/greek/errmsg.txt:
      Auto merged
    sql/share/hungarian/errmsg.txt:
      Auto merged
    sql/share/italian/errmsg.txt:
      Auto merged
    sql/share/japanese/errmsg.txt:
      Auto merged
    sql/share/korean/errmsg.txt:
      Auto merged
    sql/share/norwegian-ny/errmsg.txt:
      Auto merged
    sql/share/norwegian/errmsg.txt:
      Auto merged
    sql/share/polish/errmsg.txt:
      Auto merged
    sql/share/portuguese/errmsg.txt:
      Auto merged
    sql/share/slovak/errmsg.txt:
      Auto merged
    sql/share/spanish/errmsg.txt:
      Auto merged
    sql/share/swedish/errmsg.txt:
      Auto merged
    Docs/manual.texi:
      Bad merge.
    include/mysqld_error.h:
      Merge with 3.23
    063df98f
errmsg.txt 11.8 KB