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 | 29da4baf8e0f1e1c055c40d5caf38fc5248b4876 (patch) | |
| tree | dff8e299e24252baed98de65a5a6435bbbfcf1c4 /mysql-test/r/date_formats.result | |
| parent | ba5fd4e7daa8d611fa8559ec9d4fa269025856da (diff) | |
| parent | 9f7d7c8f740e16033f0fd0393fc222dde528a022 (diff) | |
| download | mariadb-git-29da4baf8e0f1e1c055c40d5caf38fc5248b4876.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 'mysql-test/r/date_formats.result')
| -rw-r--r-- | mysql-test/r/date_formats.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index c1c8b7b060e..fbe46e9fa21 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -478,7 +478,7 @@ str_to_date(a,b) create table t2 select str_to_date(a,b) from t1; describe t2; Field Type Null Key Default Extra -str_to_date(a,b) binary(29) YES NULL +str_to_date(a,b) datetime YES NULL select str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S.%f") as f1, str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S") as f2, str_to_date("2003-01-02", "%Y-%m-%d") as f3, |