diff options
| author | unknown <hf@deer.(none)> | 2005-04-06 15:51:24 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-04-06 15:51:24 +0500 |
| commit | e3e9ccc5277e92f49180f3bb7e2c349273b15b77 (patch) | |
| tree | 1bca388b492ee5c3d5e00f555133d6065fa56c21 /mysql-test/r/row.result | |
| parent | 566460ac64e03b2d5f44961e352965ca24bdb911 (diff) | |
| parent | acd0dbd2703b6691acce6ff67278384f5ea5700d (diff) | |
| download | mariadb-git-e3e9ccc5277e92f49180f3bb7e2c349273b15b77.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
mysql-test/r/row.result:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/row.result')
| -rw-r--r-- | mysql-test/r/row.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/row.result b/mysql-test/r/row.result index 0c75e80cb77..f7f7e3e8429 100644 --- a/mysql-test/r/row.result +++ b/mysql-test/r/row.result @@ -15,7 +15,7 @@ select row('a',1.5,3) IN (row(1,2,3), row('a',1.5,3), row('a','a','a')); row('a',1.5,3) IN (row(1,2,3), row('a',1.5,3), row('a','a','a')) 1 Warnings: -Error 1366 Incorrect decimal value: '' for column '' at row -1 +Warning 1292 Truncated incorrect DECIMAL value: 'a' Warning 1292 Truncated incorrect INTEGER value: 'a' select row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3)); row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3)) |