diff options
| author | unknown <evgen@sunlight.local> | 2007-09-24 17:23:40 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2007-09-24 17:23:40 +0400 |
| commit | e4cbbcf8a970b854bfbc34f77571afdb0b247814 (patch) | |
| tree | dff8e299e24252baed98de65a5a6435bbbfcf1c4 /sql/item_timefunc.cc | |
| parent | c2c760bdb60eaa22165b518c209381010d489604 (diff) | |
| parent | 17df0d648ca86d7074805228ba50d0f137b486d4 (diff) | |
| download | mariadb-git-e4cbbcf8a970b854bfbc34f77571afdb0b247814.tar.gz | |
Merge sunlight.local:/local_work/27216-bug-5.0-opt-mysql
into sunlight.local:/local_work/merge-5.1-opt-mysql
libmysql/libmysql.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/type_datetime.result:
Manually merged
mysql-test/t/type_datetime.test:
Manually merged
sql/item_cmpfunc.cc:
Manually merged
sql/item_cmpfunc.h:
Manually merged
sql/sql_insert.cc:
Manually merged
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 300d0788f55..59e1777f542 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3239,7 +3239,7 @@ void Item_func_str_to_date::fix_length_and_dec() String format_str(format_buff, sizeof(format_buff), &my_charset_bin), *format; maybe_null= 1; decimals=0; - cached_field_type= MYSQL_TYPE_STRING; + cached_field_type= MYSQL_TYPE_DATETIME; max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN; cached_timestamp_type= MYSQL_TIMESTAMP_NONE; format= args[1]->val_str(&format_str); |