• unknown's avatar
    Merge · a4f6f3ad
    unknown authored
    
    sql/item_create.cc:
      Auto merged
    sql/item_create.h:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/item_strfunc.h:
      Auto merged
    sql/lex.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    include/mysqld_error.h:
      merge.
    sql/share/czech/errmsg.txt:
      SCCS merged
    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:
      e
      merge.
    sql/share/italian/errmsg.txt:
      merge.
    sql/share/japanese/errmsg.txt:
      merge.
    sql/share/korean/errmsg.txt:
      merge.
    sql/share/norwegian/errmsg.txt:
      merge.
    sql/share/norwegian-ny/errmsg.txt:
      merge.
    sql/share/polish/errmsg.txt:
      merge.
    sql/share/portuguese/errmsg.txt:
      merge.
    sql/share/romanian/errmsg.txt:
      SCCS merged
    sql/share/russian/errmsg.txt:
      merge.
    sql/share/serbian/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.
    a4f6f3ad
errmsg.txt 15.8 KB