From 93690b96e2eb8b9717222cea1e2097d625cb6f50 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Wed, 11 Oct 2017 08:44:24 +0200
Subject: [PATCH] Fix warnings in Win64

---
 sql/sql_admin.cc             | 3 ++-
 unittest/mysys/ma_dyncol-t.c | 2 +-
 unittest/mysys/my_getopt-t.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index fcbcd5d31bf..dd3c2694202 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -392,8 +392,9 @@ static bool open_only_one_table(THD* thd, TABLE_LIST* table,
     open_error= (thd->open_temporary_tables(table) ||
                  open_and_lock_tables(thd, table, TRUE, 0));
   }
-
+#ifndef DBUG_OFF
 dbug_err:
+#endif
 
   thd->prepare_derived_at_open= FALSE;
 
diff --git a/unittest/mysys/ma_dyncol-t.c b/unittest/mysys/ma_dyncol-t.c
index 3b43c10a6a8..124f16e15be 100644
--- a/unittest/mysys/ma_dyncol-t.c
+++ b/unittest/mysys/ma_dyncol-t.c
@@ -124,7 +124,7 @@ void test_value_single_double(double num, const char *name)
   if (mariadb_dyncol_get_num(&str, 1, &res))
     goto err;
   rc= (res.type == DYN_COL_DOUBLE) && (res.x.double_value == num);
-  num= res.x.ulong_value;
+  num= res.x.double_value;
 err:
   ok(rc, "%s - %lf", name, num);
   /* cleanup */
diff --git a/unittest/mysys/my_getopt-t.c b/unittest/mysys/my_getopt-t.c
index 39814d76690..3e16d79424e 100644
--- a/unittest/mysys/my_getopt-t.c
+++ b/unittest/mysys/my_getopt-t.c
@@ -72,7 +72,7 @@ void run(const char *arg, ...)
     arg= va_arg(ap, char*);
   }
   va_end(ap);
-  arg_c= arg_v - arg_s;
+  arg_c= (int)(arg_v - arg_s);
   arg_v= arg_s;
   res= handle_options(&arg_c, &arg_v, mopts_options, 0);
 }