summaryrefslogtreecommitdiff
path: root/mysql-test/r/view.result
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-06-20 15:01:28 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-06-20 15:01:28 +0400
commit8c762965d389dcd9e74c743aaf2a89bd8c18545f (patch)
treea266816b7b2a7e5f2266fa46b7b8627aa5543773 /mysql-test/r/view.result
parent0b93b444b6c4de6b219fd3a4b3d5fa2e388dc211 (diff)
parent584d923c3292395a2e8288adcf4795992789f27c (diff)
downloadmariadb-git-8c762965d389dcd9e74c743aaf2a89bd8c18545f.tar.gz
Merge 5.3 -> 5.5
Diffstat (limited to 'mysql-test/r/view.result')
-rw-r--r--mysql-test/r/view.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index ae4c61a1dc7..008f8f41ada 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -4324,13 +4324,13 @@ MM
ZZ
ZZ
Warnings:
-Warning 1292 Truncated incorrect INTEGER value: 'VV'
+Warning 1292 Truncated incorrect DOUBLE value: 'VV'
EXPLAIN EXTENDED
SELECT * FROM v1 WHERE a > 'JJ' OR a AND a = 'VV';
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE t1 range a a 13 NULL 4 100.00 Using where; Using index
Warnings:
-Warning 1292 Truncated incorrect INTEGER value: 'VV'
+Warning 1292 Truncated incorrect DOUBLE value: 'VV'
Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > 'JJ')
DROP VIEW v1;
DROP TABLE t1;