• unknown's avatar
    merging · 5fe662e2
    unknown authored
    
    include/mysqld_error.h:
      Auto merged
    mysql-test/r/subselect.result:
      Auto merged
    sql/item_subselect.cc:
      Auto merged
    sql/share/czech/errmsg.txt:
      Auto merged
    sql/share/danish/errmsg.txt:
      Auto merged
    sql/share/dutch/errmsg.txt:
      Auto merged
    sql/share/english/errmsg.txt:
      Auto merged
    sql/share/estonian/errmsg.txt:
      Auto merged
    sql/share/french/errmsg.txt:
      Auto merged
    sql/share/german/errmsg.txt:
      Auto merged
    sql/share/greek/errmsg.txt:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_yacc.yy:
      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/romanian/errmsg.txt:
      Auto merged
    sql/share/russian/errmsg.txt:
      Auto merged
    sql/share/serbian/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
    sql/share/ukrainian/errmsg.txt:
      Auto merged
    5fe662e2
errmsg.txt 14.5 KB