summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-02-27 22:38:36 +0100
committerunknown <serg@serg.mylan>2004-02-27 22:38:36 +0100
commit42f5a91f59cf1573b9261707e71f5243f25f45b8 (patch)
tree49d558f2add84f7ce839dd5f58b0beff423497f9 /sql/mysqld.cc
parentd6b01aa546fafaabb5df542dacd92aa0ffbf39ed (diff)
parentfc94a719f05126f7f58248da81d20b8b9db45ccc (diff)
downloadmariadb-git-42f5a91f59cf1573b9261707e71f5243f25f45b8.tar.gz
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/item_strfunc.cc: Auto merged sql/mysqld.cc: Auto merged
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 07e07e97781..00d21560e75 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5618,7 +5618,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
break;
}
case OPT_FT_BOOLEAN_SYNTAX:
- if (ft_boolean_check_syntax_string(argument))
+ if (ft_boolean_check_syntax_string((byte*) argument))
{
fprintf(stderr, "Invalid ft-boolean-syntax string: %s\n", argument);
exit(1);