• unknown's avatar
    resolved conflict with pulled changeset · 04a75388
    unknown authored
    include/mysql.h:
      Auto merged
    include/mysql_com.h:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    sql/item_create.cc:
      Auto merged
    sql/item_create.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
    sql/sql_parse.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    include/mysqld_error.h:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/set_var.h:
      manually resolved conflict
    sql/share/czech/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/danish/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/dutch/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/english/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/estonian/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/french/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/german/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/greek/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/hungarian/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/italian/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/japanese/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/korean/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/norwegian-ny/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/norwegian/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/polish/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/portuguese/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/romanian/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/russian/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/serbian/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/slovak/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/spanish/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/swedish/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    sql/share/ukrainian/errmsg.txt:
      manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
    04a75388
errmsg.txt 15.5 KB