diff options
| author | unknown <evgen@moonbone.local> | 2006-06-20 15:35:54 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-06-20 15:35:54 +0400 |
| commit | ac2c480f26d88c35f8a527ea8ce3640e827fc0d1 (patch) | |
| tree | f91568fcc57db478fac590d74bb4151542b14ef4 /mysql-test/r/func_time.result | |
| parent | 0c4182bc46f9cd8ad662b16dafa773ab57a97872 (diff) | |
| download | mariadb-git-ac2c480f26d88c35f8a527ea8ce3640e827fc0d1.tar.gz | |
func_time.result:
After merge fix
mysql-test/r/func_time.result:
After merge fix
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 f1da903ae98..5b24480f2e9 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -785,8 +785,8 @@ select f1 from t1 where "2006-1-1" between f1 and 'zzz'; f1 Warnings: Warning 1292 Incorrect date value: 'zzz' for column 'f1' at row 1 -Warning 1292 Truncated incorrect INTEGER value: 'zzz' -Warning 1292 Truncated incorrect INTEGER value: 'zzz' +Warning 1292 Truncated incorrect DOUBLE value: 'zzz' +Warning 1292 Truncated incorrect DOUBLE value: 'zzz' select f1 from t1 where makedate(2006,1) between date(f1) and date(f3); f1 2006-01-01 |