diff options
| author | unknown <evgen@moonbone.local> | 2006-06-15 01:48:41 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-06-15 01:48:41 +0400 |
| commit | b2f308160b761f98d5864b36b33b64d82273cdcf (patch) | |
| tree | 8cc35e337f835b4b9ef71b7e4b6807e6df966c5a /mysql-test/r/func_time.result | |
| parent | 9936533be9359176ae7f196ef3291c5ee0df2e97 (diff) | |
| download | mariadb-git-b2f308160b761f98d5864b36b33b64d82273cdcf.tar.gz | |
Many files:
After merge fix
mysql-test/r/func_time.result:
After merge fix
mysql-test/r/func_concat.result:
After merge fix
mysql-test/r/cast.result:
After merge fix
sql/item_cmpfunc.h:
After merge fix
sql/item_cmpfunc.cc:
After merge fix
sql/field.cc:
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, 3 insertions, 1 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index a0faa05f988..cee5dc70c32 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -784,7 +784,9 @@ f1 select f1 from t1 where "2006-1-1" between f1 and 'zzz'; f1 Warnings: -Warning 1292 Truncated incorrect date value: 'zzz' +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' select f1 from t1 where makedate(2006,1) between date(f1) and date(f3); f1 2006-01-01 |