diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-11 23:16:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-11 23:16:33 +0200 |
| commit | 4d57bfdd485f45729031295295d78117fc5b3509 (patch) | |
| tree | 07e73d6239c236adb274afe23ebb6734d2546c43 /sql/item_strfunc.cc | |
| parent | 82403c0bb1c084b00670a51e0555920286512f2e (diff) | |
| download | mariadb-git-4d57bfdd485f45729031295295d78117fc5b3509.tar.gz | |
temporal-related changes. don't apply sql_mode flags on the lower level (str_to_datetime),
do it on the upper level, in items that return temporal values.
update tests results to match 5.6 better and to fix old bugs.
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 3decf076f4f..6ea58dfd2c9 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -4114,10 +4114,9 @@ bool Item_func_dyncol_create::prepare_arguments(bool force_names_arg) } break; case DYN_COL_DATETIME: - args[valpos]->get_date(&vals[i].x.time_value, TIME_FUZZY_DATE); - break; case DYN_COL_DATE: - args[valpos]->get_date(&vals[i].x.time_value, TIME_FUZZY_DATE); + args[valpos]->get_date(&vals[i].x.time_value, + TIME_FUZZY_DATE | sql_mode_for_dates()); break; case DYN_COL_TIME: args[valpos]->get_time(&vals[i].x.time_value); |