summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2004-02-24 19:14:41 +0200
committerunknown <monty@mashka.mysql.fi>2004-02-24 19:14:41 +0200
commit83188d50ccac7dc65af548b954f8782f1f1ffed6 (patch)
treea9ceb3022d24b95a370e197928b4f8a91086333d /sql/mysqld.cc
parent07b40e621e5ff2a285b673b6b7bab345c7c361cf (diff)
parent8388a57a96c42cc69776f17d2b3d7766e00bd41c (diff)
downloadmariadb-git-83188d50ccac7dc65af548b954f8782f1f1ffed6.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1 sql/mysqld.cc: Auto merged
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ee7e2dfadf5..1cc2456979a 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5614,6 +5614,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
}
global_system_variables.sql_mode= fix_sql_mode(global_system_variables.
sql_mode);
+ break;
}
case OPT_FT_BOOLEAN_SYNTAX:
if (ft_boolean_check_syntax_string(argument))