• unknown's avatar
    Merge · 1dcd1bbe
    unknown authored
    
    client/mysqltest.c:
      Auto merged
    include/mysqld_error.h:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    libmysqld/lib_sql.cc:
      Auto merged
    mysql-test/r/variables.result:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/handler.h:
      Auto merged
    sql/lex.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/net_serv.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/udf_example.cc:
      Auto merged
    include/sql_state.h:
      SCCS merged
    sql/sql_yacc.yy:
      SCCS merged
    1dcd1bbe
mysqld_error.h 11.5 KB