summaryrefslogtreecommitdiff
path: root/mysql-test/suite/optimizer_unfixed_bugs
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-22 18:04:38 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-22 18:04:38 +0100
commitd2755a2c9c109ddb4e2e0c9feda89431a6c4fd50 (patch)
treec6e4678908c750d7f558e98cedc349aa1d350892 /mysql-test/suite/optimizer_unfixed_bugs
parentaf32b02c06f32a89dc9f52e556bc5dd3bf49c19e (diff)
parent42221abaed700f6dc5d280b462755851780e8487 (diff)
downloadmariadb-git-d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50.tar.gz
5.3->5.5 merge
Diffstat (limited to 'mysql-test/suite/optimizer_unfixed_bugs')
-rw-r--r--mysql-test/suite/optimizer_unfixed_bugs/r/bug45219.result21
-rw-r--r--mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result12
2 files changed, 9 insertions, 24 deletions
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45219.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45219.result
index e3cee8cd055..1335120b6b0 100644
--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45219.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45219.result
@@ -56,27 +56,6 @@ WHERE ( `int_nokey` , `pk` ) IN (
SELECT INNR .`pk` , INNR .`pk`
FROM CC LEFT JOIN BB INNR ON INNR .`varchar_key` ) AND `pk` = 9 ;
datetime_key
-Warnings:
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
-Warning 1292 Truncated incorrect DOUBLE value: 'i'
DROP TABLE CC, C, BB;
DROP TABLE IF EXISTS CC, C, BB;
CREATE TABLE `CC` (
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result
index 060955d84a4..657f1f57b2d 100644
--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result
@@ -25,10 +25,10 @@ SELECT `int_key`
FROM CC
WHERE `date_nokey` < `datetime_nokey` XOR OUTR .`date_nokey` ) ;
pk
+9
2
5
6
-9
SELECT `pk`
FROM C
WHERE `pk` IN (
@@ -36,11 +36,11 @@ SELECT `int_key`
FROM CC
WHERE `date_nokey` < `datetime_nokey` XOR '2009-11-25' ) ;
pk
+9
2
-4
5
6
-9
+4
Warnings:
Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
@@ -52,6 +52,12 @@ Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
+Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
+Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
+Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
+Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
+Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
+Warning 1292 Truncated incorrect INTEGER value: '2009-11-25'
DROP TABLE CC;
DROP TABLE C;
CREATE TABLE `CC` (