summaryrefslogtreecommitdiff
path: root/strings/decimal.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/decimal.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/decimal.c')
-rw-r--r--strings/decimal.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/strings/decimal.c b/strings/decimal.c
index 1f879fbe9ad..9450cb0d54b 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -99,11 +99,10 @@
implementation-defined.
*/
-#include <my_global.h>
+#include "strings_def.h"
#include <m_ctype.h>
#include <myisampack.h>
#include <my_sys.h> /* for my_alloca */
-#include <m_string.h>
#include <decimal.h>
/*