diff options
| author | gkodinov@dl145s.mysql.com <> | 2006-09-18 18:30:51 +0400 |
|---|---|---|
| committer | gkodinov@dl145s.mysql.com <> | 2006-09-18 18:30:51 +0400 |
| commit | f1100c007d281f9334b5b4d87fc98a01308e12a4 (patch) | |
| tree | 5d9c18734ec29a0f0a7805e0e42719eaaf6c9ba6 /mysql-test/r/func_time.result | |
| parent | ce8ed889d70c63332ba1f8317baf9d6a91cf7cbe (diff) | |
| download | mariadb-git-f1100c007d281f9334b5b4d87fc98a01308e12a4.tar.gz | |
merge fixes
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 2e4f03a17d9..34507e0491c 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -870,8 +870,8 @@ f1 select f1 from t1 where cast("2006-1-1" as date) between f1 and cast('zzz' as date); f1 Warnings: -Warning 1292 Truncated incorrect datetime value: 'zzz' -Warning 1292 Truncated incorrect datetime value: 'zzz' +Warning 1292 Incorrect datetime value: 'zzz' +Warning 1292 Incorrect datetime value: 'zzz' select f1 from t1 where makedate(2006,1) between date(f1) and date(f3); f1 2006-01-01 |