From 967b2830d8bd8f94a86e4a761d90913e824cd0b5 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Wed, 16 Nov 2016 18:13:59 +0100
Subject: [PATCH] renamed ma_errmsg.h back to errmsg.h

---
 include/CMakeLists.txt            | 2 +-
 include/{ma_errmsg.h => errmsg.h} | 4 ++--
 libmariadb/ma_errmsg.c            | 2 +-
 libmariadb/ma_io.c                | 2 +-
 libmariadb/ma_loaddata.c          | 2 +-
 libmariadb/ma_pvio.c              | 2 +-
 libmariadb/ma_tls.c               | 2 +-
 libmariadb/mariadb_async.c        | 2 +-
 libmariadb/mariadb_lib.c          | 2 +-
 libmariadb/mariadb_stmt.c         | 2 +-
 libmariadb/secure/gnutls.c        | 2 +-
 libmariadb/secure/ma_schannel.h   | 2 +-
 libmariadb/secure/openssl.c       | 2 +-
 plugins/auth/my_auth.c            | 2 +-
 plugins/auth/old_password.c       | 2 +-
 plugins/connection/aurora.c       | 2 +-
 plugins/connection/replication.c  | 2 +-
 plugins/pvio/pvio_npipe.c         | 2 +-
 plugins/pvio/pvio_shmem.c         | 2 +-
 plugins/pvio/pvio_socket.c        | 2 +-
 unittest/libmariadb/my_test.h     | 2 +-
 21 files changed, 22 insertions(+), 22 deletions(-)
 rename include/{ma_errmsg.h => errmsg.h} (98%)

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 1e1d9b81..3267a7fe 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(MARIADB_CLIENT_INCLUDES ${CC_SOURCE_DIR}/include/mariadb_com.h
                             ${CC_SOURCE_DIR}/include/ma_tls.h
                             ${CC_BINARY_DIR}/include/mariadb_version.h
                             ${CC_SOURCE_DIR}/include/ma_list.h
-                            ${CC_SOURCE_DIR}/include/ma_errmsg.h
+                            ${CC_SOURCE_DIR}/include/errmsg.h
                             ${CC_SOURCE_DIR}/include/mariadb_dyncol.h
                             ${CC_SOURCE_DIR}/include/mariadb_ctype.h)
 SET(MYSQL_ADDITIONAL_INCLUDES
diff --git a/include/ma_errmsg.h b/include/errmsg.h
similarity index 98%
rename from include/ma_errmsg.h
rename to include/errmsg.h
index aefcc8d1..a2254cfd 100644
--- a/include/ma_errmsg.h
+++ b/include/errmsg.h
@@ -18,8 +18,8 @@
 
 /* Error messages for mysql clients */
 /* error messages for the demon is in share/language/errmsg.sys */
-#ifndef _ma_errmsg_h_
-#define _ma_errmsg_h_
+#ifndef _errmsg_h_
+#define _errmsg_h_
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/libmariadb/ma_errmsg.c b/libmariadb/ma_errmsg.c
index 4f415d95..eccaca69 100644
--- a/libmariadb/ma_errmsg.c
+++ b/libmariadb/ma_errmsg.c
@@ -20,7 +20,7 @@
 
 #include <ma_global.h>
 #include <ma_sys.h>
-#include "ma_errmsg.h"
+#include "errmsg.h"
 #include <stdarg.h>
 
 #ifdef GERMAN
diff --git a/libmariadb/ma_io.c b/libmariadb/ma_io.c
index c9e1509a..a84e8839 100644
--- a/libmariadb/ma_io.c
+++ b/libmariadb/ma_io.c
@@ -19,7 +19,7 @@
 
 #include <ma_global.h>
 #include <ma_sys.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <mysql.h>
 #include <mysql/client_plugin.h>
 #include <mariadb/ma_io.h>
diff --git a/libmariadb/ma_loaddata.c b/libmariadb/ma_loaddata.c
index 8bb1924f..0dd30dcf 100644
--- a/libmariadb/ma_loaddata.c
+++ b/libmariadb/ma_loaddata.c
@@ -43,7 +43,7 @@
 #include "ma_global.h"
 #include <ma_sys.h>
 #include <ma_string.h>
-#include "ma_errmsg.h"
+#include "errmsg.h"
 #include "mysql.h"
 #include <mariadb/ma_io.h>
 #include <string.h>
diff --git a/libmariadb/ma_pvio.c b/libmariadb/ma_pvio.c
index 87a4fd4a..e6b7c768 100644
--- a/libmariadb/ma_pvio.c
+++ b/libmariadb/ma_pvio.c
@@ -46,7 +46,7 @@
 #include <ma_global.h>
 #include <ma_sys.h>
 #include <mysql.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <mysql/client_plugin.h>
 #include <string.h>
 #include <ma_common.h>
diff --git a/libmariadb/ma_tls.c b/libmariadb/ma_tls.c
index cb6a6af9..f1177e0f 100644
--- a/libmariadb/ma_tls.c
+++ b/libmariadb/ma_tls.c
@@ -36,7 +36,7 @@
 #include <ma_sys.h>
 #include <ma_common.h>
 #include <string.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <ma_pvio.h>
 #include <ma_tls.h>
 #include <mysql/client_plugin.h>
diff --git a/libmariadb/mariadb_async.c b/libmariadb/mariadb_async.c
index 2929e730..c599ed2b 100644
--- a/libmariadb/mariadb_async.c
+++ b/libmariadb/mariadb_async.c
@@ -23,7 +23,7 @@
 #include "ma_global.h"
 #include "ma_sys.h"
 #include "mysql.h"
-#include "ma_errmsg.h"
+#include "errmsg.h"
 #ifndef LIBMARIADB
 #include "sql_common.h"
 #else
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index 3ae8323e..4c76c2f3 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -32,7 +32,7 @@
 #include "mariadb_version.h"
 #include "ma_server_error.h"
 #include <mariadb/ma_io.h>
-#include "ma_errmsg.h"
+#include "errmsg.h"
 #include <sys/stat.h>
 #include <signal.h>
 #include <time.h>
diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c
index 998aae9b..79c23353 100644
--- a/libmariadb/mariadb_stmt.c
+++ b/libmariadb/mariadb_stmt.c
@@ -48,7 +48,7 @@
 #include <ma_string.h>
 #include <mariadb_ctype.h>
 #include "mysql.h"
-#include "ma_errmsg.h"
+#include "errmsg.h"
 #include <ma_pvio.h>
 #include <sys/stat.h>
 #include <signal.h>
diff --git a/libmariadb/secure/gnutls.c b/libmariadb/secure/gnutls.c
index ca7f8ea6..e657cf6d 100644
--- a/libmariadb/secure/gnutls.c
+++ b/libmariadb/secure/gnutls.c
@@ -26,7 +26,7 @@
 #include <ma_sys.h>
 #include <ma_common.h>
 #include <ma_pvio.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <ma_pthread.h>
 #include <mysql/client_plugin.h>
 #include <string.h>
diff --git a/libmariadb/secure/ma_schannel.h b/libmariadb/secure/ma_schannel.h
index c7e8d182..4e398fe2 100644
--- a/libmariadb/secure/ma_schannel.h
+++ b/libmariadb/secure/ma_schannel.h
@@ -27,7 +27,7 @@
 #include <ma_sys.h>
 #include <ma_common.h>
 #include <ma_pvio.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 
 
 #include <wincrypt.h>
diff --git a/libmariadb/secure/openssl.c b/libmariadb/secure/openssl.c
index f6c47036..f3e78d0d 100644
--- a/libmariadb/secure/openssl.c
+++ b/libmariadb/secure/openssl.c
@@ -21,7 +21,7 @@
 #include <ma_sys.h>
 #include <ma_common.h>
 #include <ma_pvio.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <string.h>
 #include <mysql/client_plugin.h>
 #include <string.h>
diff --git a/plugins/auth/my_auth.c b/plugins/auth/my_auth.c
index ee4dd16b..3f40d457 100644
--- a/plugins/auth/my_auth.c
+++ b/plugins/auth/my_auth.c
@@ -1,6 +1,6 @@
 #include <ma_global.h>
 #include <ma_sys.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <string.h>
 #include <ma_common.h>
 #include <mysql/client_plugin.h>
diff --git a/plugins/auth/old_password.c b/plugins/auth/old_password.c
index 91d707a9..543a5b1d 100644
--- a/plugins/auth/old_password.c
+++ b/plugins/auth/old_password.c
@@ -21,7 +21,7 @@
 #include <mysql/client_plugin.h>
 #include <string.h>
 #include <memory.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 
 
 /* function prototypes */
diff --git a/plugins/connection/aurora.c b/plugins/connection/aurora.c
index 8fa42bc8..58301e5d 100644
--- a/plugins/connection/aurora.c
+++ b/plugins/connection/aurora.c
@@ -24,7 +24,7 @@
 
 #include <ma_global.h>
 #include <ma_sys.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <ma_common.h>
 #include <mysql.h>
 #include <mysql/client_plugin.h>
diff --git a/plugins/connection/replication.c b/plugins/connection/replication.c
index 3bf394af..97b36a0a 100644
--- a/plugins/connection/replication.c
+++ b/plugins/connection/replication.c
@@ -24,7 +24,7 @@
 
 #include <ma_global.h>
 #include <ma_sys.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <mysql.h>
 #include <mysql/client_plugin.h>
 #include <string.h>
diff --git a/plugins/pvio/pvio_npipe.c b/plugins/pvio/pvio_npipe.c
index 1bc01002..f16beec6 100644
--- a/plugins/pvio/pvio_npipe.c
+++ b/plugins/pvio/pvio_npipe.c
@@ -24,7 +24,7 @@
 
 #include <ma_global.h>
 #include <ma_sys.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <mysql.h>
 #include <mysql/client_plugin.h>
 #include <string.h>
diff --git a/plugins/pvio/pvio_shmem.c b/plugins/pvio/pvio_shmem.c
index ba6f84f6..09586c63 100644
--- a/plugins/pvio/pvio_shmem.c
+++ b/plugins/pvio/pvio_shmem.c
@@ -23,7 +23,7 @@
 
 #include <ma_global.h>
 #include <ma_sys.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <mysql.h>
 #include <mysql/client_plugin.h>
 #include <string.h>
diff --git a/plugins/pvio/pvio_socket.c b/plugins/pvio/pvio_socket.c
index 5fb8416c..11e823e0 100644
--- a/plugins/pvio/pvio_socket.c
+++ b/plugins/pvio/pvio_socket.c
@@ -26,7 +26,7 @@
 
 #include <ma_global.h>
 #include <ma_sys.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <mysql.h>
 #include <mysql/client_plugin.h>
 #include <ma_context.h>
diff --git a/unittest/libmariadb/my_test.h b/unittest/libmariadb/my_test.h
index 045d2a82..d3e4ce6b 100644
--- a/unittest/libmariadb/my_test.h
+++ b/unittest/libmariadb/my_test.h
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "ma_getopt.h"
 #include <memory.h>
 #include <string.h>
-#include <ma_errmsg.h>
+#include <errmsg.h>
 #include <stdlib.h>
 
 #ifndef WIN32