From 3e624e50dfcf11b8b6289dcd7f09a945014eb312 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Thu, 17 Nov 2016 16:04:33 +0100
Subject: [PATCH] removed definition of SQLSTATE_UNKNOWN (10.2 integration)

---
 include/errmsg.h            | 2 --
 include/mysql.h             | 1 +
 libmariadb/ma_errmsg.c      | 2 ++
 unittest/libmariadb/bulk1.c | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/errmsg.h b/include/errmsg.h
index a2254cfd..87d3eed7 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -96,6 +96,4 @@ extern const char *mariadb_client_errors[];	/* Error messages */
 #define CR_FILE_NOT_FOUND 5004
 #define CR_FILE_READ 5005
 
-#define SQLSTATE_UNKNOWN "HY000"
-
 #endif
diff --git a/include/mysql.h b/include/mysql.h
index 099ff5b5..539d8e64 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -130,6 +130,7 @@ extern unsigned int mariadb_deinitialize_ssl;
 
 /* For mysql_async.c */
 #define set_mariadb_error(A,B,C) SET_CLIENT_ERROR((A),(B),(C),0)
+extern const char *SQLSTATE_UNKNOWN;
 #define unknown_sqlstate SQLSTATE_UNKNOWN
 
 #define CLEAR_CLIENT_ERROR(a) \
diff --git a/libmariadb/ma_errmsg.c b/libmariadb/ma_errmsg.c
index eccaca69..353e7431 100644
--- a/libmariadb/ma_errmsg.c
+++ b/libmariadb/ma_errmsg.c
@@ -23,6 +23,8 @@
 #include "errmsg.h"
 #include <stdarg.h>
 
+const char *SQLSTATE_UNKNOWN= "HY000";
+
 #ifdef GERMAN
 const char *client_errors[]=
 {
diff --git a/unittest/libmariadb/bulk1.c b/unittest/libmariadb/bulk1.c
index 246e2ec5..cfa70938 100644
--- a/unittest/libmariadb/bulk1.c
+++ b/unittest/libmariadb/bulk1.c
@@ -198,7 +198,6 @@ static int bulk3(MYSQL *mysql)
   MYSQL_STMT *stmt= mysql_stmt_init(mysql);
   size_t row_size= sizeof(struct st_bulk3);
   int array_size= 3;
-  int i;
 
   if (!bulk_enabled)
     return SKIP;