diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-07-08 16:49:42 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-07-08 16:49:42 +0400 |
| commit | 1f3ec9800c6c186949302ba27f0137dfe7c0f5f5 (patch) | |
| tree | e0e46189e0c73712d39954f0280c63830fd5332e /mysql-test/r/partition_pruning.result | |
| parent | 874bb251372d60243d44e2ba74f0237bc88ec8c2 (diff) | |
| parent | 78cc6db44a9f1344dd5c00cf4f3cdde158fe108e (diff) | |
| download | mariadb-git-1f3ec9800c6c186949302ba27f0137dfe7c0f5f5.tar.gz | |
Merging from 5.3
modified:
include/my_time.h
libmysql/libmysql.c
mysql-test/r/adddate_454.result
mysql-test/r/cast.result
mysql-test/r/date_formats.result
mysql-test/r/func_sapdb.result
mysql-test/r/func_time.result
mysql-test/r/mdev316.result
mysql-test/r/parser.result
mysql-test/r/partition_datatype.result
mysql-test/r/partition_pruning.result
mysql-test/r/type_date.result
mysql-test/r/type_datetime.result
mysql-test/suite/vcol/r/vcol_misc.result
mysql-test/t/cast.test
sql-common/my_time.c
sql/field.cc
sql/field_conv.cc
sql/filesort.cc
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_strfunc.cc
sql/item_timefunc.cc
sql/sql_time.cc
pending merges:
Sergei Golubchik 2013-07-03 MDEV-4667 DATE('string') incompability betwe...
Diffstat (limited to 'mysql-test/r/partition_pruning.result')
| -rw-r--r-- | mysql-test/r/partition_pruning.result | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/partition_pruning.result b/mysql-test/r/partition_pruning.result index f4d473c00d5..ec7fd798d4c 100644 --- a/mysql-test/r/partition_pruning.result +++ b/mysql-test/r/partition_pruning.result @@ -2235,10 +2235,9 @@ INSERT INTO t1 VALUES (1, '2009-01-01'), (2, NULL); # test with an invalid date, which lead to item->null_value is set. EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-99' AS DATETIME); id select_type table partitions type possible_keys key key_len ref rows Extra -1 SIMPLE t1 p20090401 ALL NULL NULL NULL NULL 2 Using where +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: Warning 1292 Incorrect datetime value: '2009-04-99' -Warning 1292 Incorrect datetime value: '2009-04-99' DROP TABLE t1; CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, |