diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
commit | d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50 (patch) | |
tree | c6e4678908c750d7f558e98cedc349aa1d350892 /mysql-test/r/dyncol.result | |
parent | af32b02c06f32a89dc9f52e556bc5dd3bf49c19e (diff) | |
parent | 42221abaed700f6dc5d280b462755851780e8487 (diff) | |
download | mariadb-git-d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50.tar.gz |
5.3->5.5 merge
Diffstat (limited to 'mysql-test/r/dyncol.result')
-rw-r--r-- | mysql-test/r/dyncol.result | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result index 60f9dca0dd7..f4a858c3029 100644 --- a/mysql-test/r/dyncol.result +++ b/mysql-test/r/dyncol.result @@ -838,9 +838,7 @@ column_get(column_create(1, "2001021"), 1 as date) set @@sql_mode="allow_invalid_dates"; select column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as date); column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as date) -NULL -Warnings: -Warning 1292 Truncated incorrect date value: '2011-02-30' +2011-02-30 select column_get(column_create(1, "0000-00-000" AS CHAR), 1 as date); column_get(column_create(1, "0000-00-000" AS CHAR), 1 as date) 0000-00-00 |