summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorunknown <Greg@greg-laptop.>2004-02-27 17:27:07 +0100
committerunknown <Greg@greg-laptop.>2004-02-27 17:27:07 +0100
commit8d7e0a28946da81486c023af086942dd025174a6 (patch)
treea20a7df1a4ad4c4423bc3186e339b4ecbbb62751 /sql/set_var.cc
parentada82a3daac420bcd873df37ced77ed258edf0f2 (diff)
downloadmariadb-git-8d7e0a28946da81486c023af086942dd025174a6.tar.gz
Applied fixes to issues discovered during test builds on Windows.
VC++Files/libmysql/libmysql.dsp: strtod.c is needed to build the library. VC++Files/libmysqld/libmysqld.dsp: Add include directory to resolve problem with including emb_qcache.h, remove opt_ft.cc (no longer in tree). VC++Files/mysqldemb/mysqldemb.dsp: Add include directory to resolve problem with including emb_qcache.h, remove opt_ft.cc (no longer in tree). VC++Files/mysqlserver/mysqlserver.dsp: Add include directory to resolve problem with including emb_qcache.h. VC++Files/strings/MASM6x/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. VC++Files/strings/noMASM/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. VC++Files/strings/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. sql/mysqld.cc: A cast is required to resolve the compile error on Windows (char * is not equivalent to byte *). sql/set_var.cc: A cast is required to resolve the compile error on Windows (char * is not equivalent to byte *). BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc2
1 files changed, 1 insertions, 1 deletions
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
{