Commit 93690b96 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix warnings in Win64

parent daabb4d0
...@@ -392,8 +392,9 @@ static bool open_only_one_table(THD* thd, TABLE_LIST* table, ...@@ -392,8 +392,9 @@ static bool open_only_one_table(THD* thd, TABLE_LIST* table,
open_error= (thd->open_temporary_tables(table) || open_error= (thd->open_temporary_tables(table) ||
open_and_lock_tables(thd, table, TRUE, 0)); open_and_lock_tables(thd, table, TRUE, 0));
} }
#ifndef DBUG_OFF
dbug_err: dbug_err:
#endif
thd->prepare_derived_at_open= FALSE; thd->prepare_derived_at_open= FALSE;
......
...@@ -124,7 +124,7 @@ void test_value_single_double(double num, const char *name) ...@@ -124,7 +124,7 @@ void test_value_single_double(double num, const char *name)
if (mariadb_dyncol_get_num(&str, 1, &res)) if (mariadb_dyncol_get_num(&str, 1, &res))
goto err; goto err;
rc= (res.type == DYN_COL_DOUBLE) && (res.x.double_value == num); rc= (res.type == DYN_COL_DOUBLE) && (res.x.double_value == num);
num= res.x.ulong_value; num= res.x.double_value;
err: err:
ok(rc, "%s - %lf", name, num); ok(rc, "%s - %lf", name, num);
/* cleanup */ /* cleanup */
......
...@@ -72,7 +72,7 @@ void run(const char *arg, ...) ...@@ -72,7 +72,7 @@ void run(const char *arg, ...)
arg= va_arg(ap, char*); arg= va_arg(ap, char*);
} }
va_end(ap); va_end(ap);
arg_c= arg_v - arg_s; arg_c= (int)(arg_v - arg_s);
arg_v= arg_s; arg_v= arg_s;
res= handle_options(&arg_c, &arg_v, mopts_options, 0); res= handle_options(&arg_c, &arg_v, mopts_options, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment