• unknown's avatar
    Manual merge fixes · b4d59a8d
    unknown authored
    
    sql/lex.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/repl_failsafe.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/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/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
    sql/sql_lex.h:
      Auto merged
    sql/sql_repl.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    include/mysqld_error.h:
      Mabual merge
    mysql-test/r/rpl_flush_log_loop.result:
      Mabual merge
    mysql-test/r/rpl_log.result:
      Mabual merge
    mysql-test/r/rpl_log_pos.result:
      Mabual merge
    mysql-test/r/rpl_replicate_do.result:
      Mabual merge
    mysql-test/r/rpl_rotate_logs.result:
      Mabual merge
    sql/slave.cc:
      Mabual merge
    sql/slave.h:
      Mabual merge
    b4d59a8d
errmsg.txt 15.6 KB