summaryrefslogtreecommitdiff
path: root/client/sql_string.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-06-07 00:31:53 +0300
committermonty@mysql.com <>2005-06-07 00:31:53 +0300
commit775f17667be97bc76a25324e8a99e72ae445e223 (patch)
tree1a560cda860f9d9f422087da93fcdc67cd9f66d0 /client/sql_string.cc
parent8c94b5fba7f6e5518616615da63c8029c5790aea (diff)
parentabb2d7aa347c0d12ad40fc04315167d3274baae0 (diff)
downloadmariadb-git-775f17667be97bc76a25324e8a99e72ae445e223.tar.gz
Merge with 4.1
Diffstat (limited to 'client/sql_string.cc')
-rw-r--r--client/sql_string.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/sql_string.cc b/client/sql_string.cc
index be4354227a5..51f802e7465 100644
--- a/client/sql_string.cc
+++ b/client/sql_string.cc
@@ -16,12 +16,11 @@
/* This file is originally from the mysql distribution. Coded by monty */
-#include <my_global.h>
-
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif
+#include <my_global.h>
#include <my_sys.h>
#include <m_string.h>
#include <m_ctype.h>