summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorMats Kindahl <mats@sun.com>2010-03-31 16:05:33 +0200
committerMats Kindahl <mats@sun.com>2010-03-31 16:05:33 +0200
commite409d6f69c91a9f097802455dd61a2387e16d5f0 (patch)
tree19f32879e77ada23d733f35173a25f410d655ebe /sql/item_timefunc.h
parent36430c53f98931028ce318bed7f2834a4ff30195 (diff)
downloadmariadb-git-e409d6f69c91a9f097802455dd61a2387e16d5f0.tar.gz
WL#5030: Split and remove mysql_priv.h
This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.h
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 20e4d6488d6..2c08853fda4 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -23,6 +23,8 @@
#pragma interface /* gcc class implementation */
#endif
+class MY_LOCALE;
+
enum date_time_format_types
{
TIME_ONLY= 0, TIME_MICROSECOND, DATE_ONLY, DATE_TIME, DATE_TIME_MICROSECOND
@@ -1066,4 +1068,10 @@ public:
}
};
+
+/* Function prototypes */
+
+bool make_date_time(DATE_TIME_FORMAT *format, MYSQL_TIME *l_time,
+ timestamp_type type, String *str);
+
#endif /* ITEM_TIMEFUNC_INCLUDED */