summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-08 17:15:13 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-08 17:15:13 +0200
commit50b270525a5d2626c81425890e74d906f5515e89 (patch)
tree3500af31b2674edd9f9d621f8549b6911ab7cdec /sql/mysqld.h
parent9cbf8ccf2990f9db8d9debee42bc9213cbb04457 (diff)
parent1d480419822b53c840de54542c1d1a0851dbe2c8 (diff)
downloadmariadb-git-50b270525a5d2626c81425890e74d906f5515e89.tar.gz
Merge branch '10.7' into 10.8
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 9c09e993470..3aab2ba0da6 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -965,7 +965,6 @@ extern my_bool opt_stack_trace, disable_log_notes;
extern my_bool opt_expect_abort;
extern my_bool opt_slave_sql_verify_checksum;
extern my_bool opt_mysql56_temporal_format, strict_password_validation;
-extern my_bool opt_explicit_defaults_for_timestamp;
extern ulong binlog_checksum_options;
extern bool max_user_connections_checking;
extern ulong opt_binlog_dbug_fsync_sleep;