summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <sasha@asksasha.com>2005-10-22 18:17:11 -0600
committerunknown <sasha@asksasha.com>2005-10-22 18:17:11 -0600
commite1d9902f4485fd47d4db79f13a5d2c02e9e83753 (patch)
tree901411228462f0ae509b4fbc535ea8e79f45c106 /sql/mysqld.cc
parentd29ecd5e91adf6eaeb4f2afef0db30648fe08065 (diff)
downloadmariadb-git-e1d9902f4485fd47d4db79f13a5d2c02e9e83753.tar.gz
fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is used
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e51eb481767..1d1649edc94 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5212,7 +5212,7 @@ replicating a LOAD DATA INFILE command.",
{"sql-bin-update-same", OPT_SQL_BIN_UPDATE_SAME,
"The update log is deprecated since version 5.0, is replaced by the binary \
log and this option does nothing anymore.",
- 0, 0, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+ 0, 0, 0, GET_DISABLED, NO_ARG, 0, 0, 0, 0, 0, 0},
{"sql-mode", OPT_SQL_MODE,
"Syntax: sql-mode=option[,option[,option...]] where option can be one of: REAL_AS_FLOAT, PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, ONLY_FULL_GROUP_BY, NO_UNSIGNED_SUBTRACTION.",
(gptr*) &sql_mode_str, (gptr*) &sql_mode_str, 0, GET_STR, REQUIRED_ARG, 0,