summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-06-09 17:23:39 +0200
committerSergei Golubchik <sergii@pisem.net>2011-06-09 17:23:39 +0200
commitc3f665dc66d7ddb068875be9e78eb9b7a0d250e6 (patch)
tree409ebafb1a45415e89137c3066110afaa94420ae /sql/mysql_priv.h
parent9b98cae4cc44fa39813675b361b7aa65d129b29d (diff)
downloadmariadb-git-c3f665dc66d7ddb068875be9e78eb9b7a0d250e6.tar.gz
bugfixes:
microsecond(TIME) alter table datetime<->datetime(6) max(TIME), mix(TIME) mysql-test/t/func_if.test: fix the test case of avoid overflow sql/field.cc: don't use make_date() and make_time() sql/field.h: correct eq_def() for temporal fields sql/item.cc: move datetime caching from Item_cache_int to Item_cache_temporal sql/item.h: move datetime caching from Item_cache_int to Item_cache_temporal sql/item_func.cc: use existing helper methods, don't duplicate sql/item_sum.cc: argument cache must use argument's cmp_type, not result_type. sql/item_timefunc.cc: use existing methods, don't tuplicate. remove unused function. fix micorseconds() to support TIME argument sql/mysql_priv.h: dead code sql/time.cc: dead code
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index b89410b4d76..18c6a78dcfc 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -2503,12 +2503,6 @@ const char *get_date_time_format_str(KNOWN_DATE_TIME_FORMAT *format,
timestamp_type type);
extern bool make_date_time(DATE_TIME_FORMAT *format, MYSQL_TIME *l_time,
timestamp_type type, String *str);
-void make_datetime(const DATE_TIME_FORMAT *format, const MYSQL_TIME *l_time,
- String *str);
-void make_date(const DATE_TIME_FORMAT *format, const MYSQL_TIME *l_time,
- String *str);
-void make_time(const DATE_TIME_FORMAT *format, const MYSQL_TIME *l_time,
- String *str);
int my_time_compare(MYSQL_TIME *a, MYSQL_TIME *b);
longlong get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
Item *warn_item, bool *is_null);