diff options
author | Michael Widenius <monty@askmonty.org> | 2011-01-30 16:43:23 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-01-30 16:43:23 +0200 |
commit | 2e75dda33ebc7468f777f55e403c1d40a00ec0e0 (patch) | |
tree | b9ebb0c9950f8fa52958d1198e6df31c21cee7a3 /strings/ctype-win1250ch.c | |
parent | 4e17ec5a298b118e7f86df8d470abf06d3d5dbad (diff) | |
parent | 5bcf3a242c753449dde504a1a27712ad48b3ed8c (diff) | |
download | mariadb-git-2e75dda33ebc7468f777f55e403c1d40a00ec0e0.tar.gz |
Merge with 5.1
Fixed a couple of compilation failures that was not detected before merge.
Diffstat (limited to 'strings/ctype-win1250ch.c')
-rw-r--r-- | strings/ctype-win1250ch.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c index b22b4364e8a..30bf2146c9d 100644 --- a/strings/ctype-win1250ch.c +++ b/strings/ctype-win1250ch.c @@ -39,9 +39,8 @@ #define REAL_MYSQL #ifdef REAL_MYSQL -#include "my_global.h" -#include "m_string.h" -#include "m_ctype.h" +#include "strings_def.h" +#include <m_ctype.h> #else |