From a9d1d76e5eb33d7d7762140625d09bbfb9ae91bb Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 3 Jul 2013 22:50:34 +0300 Subject: Fixed issues with partitions and create temporary table SELECT ... Merged all ddl_logging code. Merged sql_partition.cc innodb_mysql_lock2.test and partition_cache.test now works. Changed interface to strconvert() to make it easier to use with not \0 terminated strings. sql/sql_partition.cc: Full merge with 5.6 sql/sql_table.cc: Merged all ddl_logging code sql/strfunc.cc: Added from_length argument to strconvert() to make it possible to use without end terminated strings. sql/strfunc.h: Added from_length argument to strconvert() to make it possible to use without end terminated strings. --- sql/item_timefunc.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/item_timefunc.cc') diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 8177a019386..e599292f67e 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -417,8 +417,8 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, if (((fuzzy_date & TIME_NO_ZERO_IN_DATE) && (l_time->year == 0 || l_time->month == 0 || l_time->day == 0)) || - (fuzzy_date & TIME_NO_ZERO_DATE) && - (l_time->year == 0 && l_time->month == 0 && l_time->day == 0)) + ((fuzzy_date & TIME_NO_ZERO_DATE) && + (l_time->year == 0 && l_time->month == 0 && l_time->day == 0))) goto err; if (val != val_end) -- cgit v1.2.1