summaryrefslogtreecommitdiff
path: root/strings/ctype-simple.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-02-28 19:39:30 +0200
committerMichael Widenius <monty@askmonty.org>2011-02-28 19:39:30 +0200
commit11ed10cbe2c7c4b83aca4153856e76f4bdc484dd (patch)
treeda0e622896425203d23ecdfd1bc77b57e3502edf /strings/ctype-simple.c
parentdfcc0010cf7be502bfca31aff75ba830f6962264 (diff)
parent670f2f62c48741ea72440a1574dc99bae9390131 (diff)
downloadmariadb-git-11ed10cbe2c7c4b83aca4153856e76f4bdc484dd.tar.gz
Merge with 5.1 to get in changes from MySQL 5.1.55
Diffstat (limited to 'strings/ctype-simple.c')
-rw-r--r--strings/ctype-simple.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 2c55137e3a0..2894c1fbf95 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -13,9 +13,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
#include "my_sys.h" /* Needed for MY_ERRNO_ERANGE */
#include <errno.h>