summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-06-03 23:46:03 +0300
committermonty@mysql.com <>2005-06-03 23:46:03 +0300
commit29fd1f2fd93a9cad806814556be3eb0c53cd6c7c (patch)
tree1f3455d4bb48f50d0cf7630ce12209eefac021a2 /sql/item_timefunc.cc
parentfd17d75923dd06471e1659d02832f2dbe22c8c70 (diff)
downloadmariadb-git-29fd1f2fd93a9cad806814556be3eb0c53cd6c7c.tar.gz
Move USE_PRAGMA_IMPLEMENTATION to proper place
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r--sql/item_timefunc.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 9f5cd61f95a..b7f9236ce46 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -17,13 +17,10 @@
/* This file defines all time functions */
-#include <my_global.h>
-
+#include "mysql_priv.h"
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif
-
-#include "mysql_priv.h"
#include <m_ctype.h>
#include <time.h>