summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc2
-rw-r--r--sql/set_var.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 1cc2456979a..754fc165c85 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5617,7 +5617,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);
diff --git a/sql/set_var.cc b/sql/set_var.cc
index f3728ce9e5d..12be0225421 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -860,7 +860,7 @@ static void sys_default_init_slave(THD* thd, enum_var_type type)
static int sys_check_ftb_syntax(THD *thd, set_var *var)
{
if (thd->master_access & SUPER_ACL)
- return ft_boolean_check_syntax_string(var->value->str_value.c_ptr()) ?
+ return ft_boolean_check_syntax_string((byte*) var->value->str_value.c_ptr()) ?
-1 : 0;
else
{