mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
merge
sql/mysql_priv.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged
This commit is contained in:
commit
469d7c12b8
26 changed files with 470 additions and 75 deletions
|
|
@ -449,10 +449,10 @@ sys_var_thd_date_time_format sys_datetime_format("datetime_format",
|
|||
|
||||
/* Variables that are bits in THD */
|
||||
|
||||
static sys_var_thd_bit sys_autocommit("autocommit", 0,
|
||||
set_option_autocommit,
|
||||
OPTION_NOT_AUTOCOMMIT,
|
||||
1);
|
||||
sys_var_thd_bit sys_autocommit("autocommit", 0,
|
||||
set_option_autocommit,
|
||||
OPTION_NOT_AUTOCOMMIT,
|
||||
1);
|
||||
static sys_var_thd_bit sys_big_tables("big_tables", 0,
|
||||
set_option_bit,
|
||||
OPTION_BIG_TABLES);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue