summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-14 02:54:33 +0300
committermonty@hundin.mysql.fi <>2001-09-14 02:54:33 +0300
commit7cadc6e711cedf2d8cfd9809616b9e521927f4b7 (patch)
tree633afdf8fdbda69f1a5a66b706478fa9e37cf0f8 /libmysqld
parente28586e005f913b8ba328d9a099b10a8158647ee (diff)
downloadmariadb-git-7cadc6e711cedf2d8cfd9809616b9e521927f4b7.tar.gz
Changed to use my_global.h
Fixed problem with LIKE with latin1_de Added parsing support of UNSIGNED LONG LONG
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc2
-rw-r--r--libmysqld/lib_vio.c2
-rw-r--r--libmysqld/libmysqld.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 739f1fc7fe7..015ca7b7287 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -12,7 +12,7 @@
* modified is included with the above copyright notice.
*
*/
-#include "global.h"
+#include "my_global.h"
#include "my_pthread.h"
#include "sys/types.h"
#include "../regex/regex.h"
diff --git a/libmysqld/lib_vio.c b/libmysqld/lib_vio.c
index fd4eb4ac29f..e86e6c7e8da 100644
--- a/libmysqld/lib_vio.c
+++ b/libmysqld/lib_vio.c
@@ -22,7 +22,7 @@
the file descriptior.
*/
-#include <global.h>
+#include <my_global.h>
#ifndef HAVE_VIO /* is Vio suppored by the Vio lib ? */
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index 0e66ceb2f40..53a05a24265 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -16,7 +16,7 @@
MA 02111-1307, USA */
#define DONT_USE_RAID
-#include <global.h>
+#include <my_global.h>
#if defined(__WIN__) || defined(_WIN32) || defined(_WIN64)
#include <winsock.h>
#include <odbcinst.h>