diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
| commit | 22d455612b0abbb4b9f527e61348d4c6336b59d5 (patch) | |
| tree | d39436232e232c5a5beb996e86e2b34b05ab5115 /sql/sys_vars.cc | |
| parent | bfdc4ff22ecf626eb46479e1a0dc1049d61a8d78 (diff) | |
| parent | 75d631f333544de4487a6dd251d6f361e1d55d6b (diff) | |
| download | mariadb-git-22d455612b0abbb4b9f527e61348d4c6336b59d5.tar.gz | |
Merge branch '10.8' into 10.9
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 7a86dae5606..5c5854afad5 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -719,15 +719,13 @@ Sys_binlog_direct( CMD_LINE(OPT_ARG), DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(binlog_direct_check)); - -static Sys_var_mybool Sys_explicit_defaults_for_timestamp( +static Sys_var_bit Sys_explicit_defaults_for_timestamp( "explicit_defaults_for_timestamp", "This option causes CREATE TABLE to create all TIMESTAMP columns " "as NULL with DEFAULT NULL attribute, Without this option, " "TIMESTAMP columns are NOT NULL and have implicit DEFAULT clauses.", - READ_ONLY GLOBAL_VAR(opt_explicit_defaults_for_timestamp), - CMD_LINE(OPT_ARG), DEFAULT(FALSE)); - + SESSION_VAR(option_bits), CMD_LINE(OPT_ARG), + OPTION_EXPLICIT_DEF_TIMESTAMP, DEFAULT(FALSE), NO_MUTEX_GUARD, IN_BINLOG); static Sys_var_ulonglong Sys_bulk_insert_buff_size( "bulk_insert_buffer_size", "Size of tree cache used in bulk " |