renamed ma_errmsg.h back to errmsg.h

9EOR9 · 9EOR9 · commit 967b2830d8bd · 2016-11-16T18:13:59.000+01:00
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
