diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-07-03 22:50:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-07-03 22:50:34 +0300 |
| commit | a9d1d76e5eb33d7d7762140625d09bbfb9ae91bb (patch) | |
| tree | 8bc0efc14fbc8ff396dec2a802545bfc8ec7c6ca /sql/item_timefunc.cc | |
| parent | 68262ba648886e2d5f35fc85e3cc45df7ffd9ae5 (diff) | |
| download | mariadb-git-a9d1d76e5eb33d7d7762140625d09bbfb9ae91bb.tar.gz | |
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.
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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) |