summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/field.h1
-rw-r--r--sql/sql_string.cc1
-rw-r--r--sql/sql_string.h4
3 files changed, 1 insertions, 5 deletions
diff --git a/sql/field.h b/sql/field.h
index 9855ec563d5..c3a90dc0754 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -23,7 +23,6 @@
#pragma interface /* gcc class implementation */
#endif
-#define NOT_FIXED_DEC 31
#define DATETIME_DEC 6
const uint32 max_field_size= (uint32) 4294967295U;
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 7fa3786c382..d2899f496a5 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -23,6 +23,7 @@
#include <my_sys.h>
#include <m_string.h>
#include <m_ctype.h>
+#include <mysql_com.h>
#ifdef HAVE_FCONVERT
#include <floatingpoint.h>
#endif
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 128ed749b5f..19d63a94f54 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -19,10 +19,6 @@
#pragma interface /* gcc class implementation */
#endif
-#ifndef NOT_FIXED_DEC
-#define NOT_FIXED_DEC 31
-#endif
-
class String;
int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);