[Commits] aeff61e: MDEV-12064 Bug#18411494 WRONG COMPARSION ON BIG DECIMAL VALUES.

Alexey Botchkov holyfoot at askmonty.org
Tue Mar 7 15:28:36 EET 2017


revision-id: aeff61ee5857f2351030c604f62dc7628543209a (mariadb-10.1.21-51-gaeff61e)
parent(s): ea31755760537723ded855794c16dd31c3db08c6
committer: Alexey Botchkov
timestamp: 2017-03-07 17:27:27 +0400
message:

MDEV-12064 Bug#18411494 WRONG COMPARSION ON BIG DECIMAL VALUES.

        Test results updated.

---
 mysql-test/r/select.result           |  2 +-
 mysql-test/r/select_jcl6.result      |  2 +-
 mysql-test/r/select_pkeycache.result |  2 +-
 mysql-test/r/type_num.result         | 29 +++++++++++++++--------------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index ca8b235..787e321 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2956,7 +2956,7 @@ insert into t1 values (1,'x',5);
 select * from t1 natural join v1;
 s1	s2	s3
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DECIMAL value: 'x'
 drop table t1;
 drop view v1;
 create table t1(a1 int);
diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result
index 4659b07..10d8a05 100644
--- a/mysql-test/r/select_jcl6.result
+++ b/mysql-test/r/select_jcl6.result
@@ -2967,7 +2967,7 @@ insert into t1 values (1,'x',5);
 select * from t1 natural join v1;
 s1	s2	s3
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DECIMAL value: 'x'
 drop table t1;
 drop view v1;
 create table t1(a1 int);
diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result
index ca8b235..787e321 100644
--- a/mysql-test/r/select_pkeycache.result
+++ b/mysql-test/r/select_pkeycache.result
@@ -2956,7 +2956,7 @@ insert into t1 values (1,'x',5);
 select * from t1 natural join v1;
 s1	s2	s3
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DECIMAL value: 'x'
 drop table t1;
 drop view v1;
 create table t1(a1 int);
diff --git a/mysql-test/r/type_num.result b/mysql-test/r/type_num.result
index 9ee67ac..2eed789 100644
--- a/mysql-test/r/type_num.result
+++ b/mysql-test/r/type_num.result
@@ -570,7 +570,7 @@ SELECT COUNT(*) FROM t1 WHERE d='1 ';
 COUNT(*)
 2
 Warnings:
-Note	1292	Truncated incorrect DOUBLE value: '1 '
+Note	1292	Truncated incorrect DECIMAL value: '1 '
 SELECT COUNT(*) FROM t1 WHERE f4='';
 COUNT(*)
 2
@@ -605,7 +605,7 @@ SELECT COUNT(*) FROM t1 WHERE d='';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: ''
+Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT COUNT(*) FROM t1 WHERE f4='x';
 COUNT(*)
 2
@@ -640,7 +640,7 @@ SELECT COUNT(*) FROM t1 WHERE d='x';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'x'
+Warning	1292	Truncated incorrect DECIMAL value: 'x'
 SELECT COUNT(*) FROM t1 WHERE f4=' x';
 COUNT(*)
 2
@@ -675,7 +675,7 @@ SELECT COUNT(*) FROM t1 WHERE d=' x';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: ' x'
+Warning	1292	Truncated incorrect DECIMAL value: ' x'
 SELECT COUNT(*) FROM t1 WHERE f4='.';
 COUNT(*)
 2
@@ -710,7 +710,7 @@ SELECT COUNT(*) FROM t1 WHERE d='.';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '.'
+Warning	1292	Truncated incorrect DECIMAL value: '.'
 SELECT COUNT(*) FROM t1 WHERE f4='-';
 COUNT(*)
 2
@@ -745,7 +745,7 @@ SELECT COUNT(*) FROM t1 WHERE d='-';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '-'
+Warning	1292	Truncated incorrect DECIMAL value: '-'
 SELECT COUNT(*) FROM t1 WHERE f4='+';
 COUNT(*)
 2
@@ -780,7 +780,7 @@ SELECT COUNT(*) FROM t1 WHERE d='+';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '+'
+Warning	1292	Truncated incorrect DECIMAL value: '+'
 SELECT COUNT(*) FROM t1 WHERE f4='1x';
 COUNT(*)
 2
@@ -815,7 +815,7 @@ SELECT COUNT(*) FROM t1 WHERE d='1x';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '1x'
+Warning	1292	Truncated incorrect DECIMAL value: '1x'
 SELECT COUNT(*) FROM t1 WHERE f4='1e';
 COUNT(*)
 2
@@ -850,7 +850,7 @@ SELECT COUNT(*) FROM t1 WHERE d='1e';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '1e'
+Warning	1292	Truncated incorrect DECIMAL value: '1e'
 SELECT COUNT(*) FROM t1 WHERE f4='1e+';
 COUNT(*)
 2
@@ -885,7 +885,7 @@ SELECT COUNT(*) FROM t1 WHERE d='1e+';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '1e+'
+Warning	1292	Truncated incorrect DECIMAL value: '1e+'
 SELECT COUNT(*) FROM t1 WHERE f4='1E-';
 COUNT(*)
 2
@@ -920,7 +920,7 @@ SELECT COUNT(*) FROM t1 WHERE d='1E-';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '1E-'
+Warning	1292	Truncated incorrect DECIMAL value: '1E-'
 SELECT COUNT(*) FROM t1 WHERE f4='1Ex';
 COUNT(*)
 2
@@ -955,7 +955,7 @@ SELECT COUNT(*) FROM t1 WHERE d='1Ex';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '1Ex'
+Warning	1292	Truncated incorrect DECIMAL value: '1Ex'
 SELECT COUNT(*) FROM t1 WHERE f4='1e+x';
 COUNT(*)
 2
@@ -990,7 +990,7 @@ SELECT COUNT(*) FROM t1 WHERE d='1e+x';
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '1e+x'
+Warning	1292	Truncated incorrect DECIMAL value: '1e+x'
 SELECT COUNT(*) FROM t1 WHERE f4='1e1000';
 COUNT(*)
 0
@@ -1025,7 +1025,8 @@ SELECT COUNT(*) FROM t1 WHERE d='1e1000';
 COUNT(*)
 0
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: '1e1000'
+Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated.
+Warning	1292	Truncated incorrect DECIMAL value: '1e1000'
 ALTER TABLE t1
 ADD KEY f4(f4),
 ADD KEY f8(f8),


More information about the commits mailing list