Skip to content

M
MariaDB
Commit e8ccb2d5 authored by Alexey Kopytov's avatar Alexey Kopytov
Browse files
Options

Fixed more PB2 test failures introduced by backporting WL#2934.

parent e838c042
Expand all Show whitespace changes
Inline Side-by-side
Showing with 316 additions and 319 deletions
mysql-test/suite/funcs_1/r/innodb_views.result
View file @ e8ccb2d5
...@@ -22824,7 +22824,7 @@ f1 f2 ...@@ -22824,7 +22824,7 @@ f1 f2
ABC 3 ABC 3
SELECT * FROM v1 order by 2; SELECT * FROM v1 order by 2;
f1 my_sqrt f1 my_sqrt
ABC 1.73205080756888 ABC 1.7320508075688772
ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30); ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
INSERT INTO t1 SET f1 = 'ABC', f2 = 'DEF'; INSERT INTO t1 SET f1 = 'ABC', f2 = 'DEF';
DESCRIBE t1; DESCRIBE t1;
...@@ -22842,7 +22842,7 @@ ABC DEF ...@@ -22842,7 +22842,7 @@ ABC DEF
SELECT * FROM v1 order by 2; SELECT * FROM v1 order by 2;
f1 my_sqrt f1 my_sqrt
ABC 0 ABC 0
ABC 1.73205080756888 ABC 1.7320508075688772
Warnings: Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
...@@ -22865,7 +22865,7 @@ my_sqrt double YES NULL ...@@ -22865,7 +22865,7 @@ my_sqrt double YES NULL
SELECT * FROM v2 order by 2; SELECT * FROM v2 order by 2;
f1 my_sqrt f1 my_sqrt
ABC 0 ABC 0
ABC 1.73205080756888 ABC 1.7320508075688772
Warnings: Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
...@@ -22876,7 +22876,7 @@ SELECT * FROM t2 order by 2; ...@@ -22876,7 +22876,7 @@ SELECT * FROM t2 order by 2;
f1 ABC f1 ABC
my_sqrt 0 my_sqrt 0
f1 ABC f1 ABC
my_sqrt 1.73205080756888 my_sqrt 1.7320508075688772
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 AS SELECT * FROM v1; CREATE TABLE t2 AS SELECT * FROM v1;
Warnings: Warnings:
...@@ -22885,7 +22885,7 @@ SELECT * FROM t2 order by 2; ...@@ -22885,7 +22885,7 @@ SELECT * FROM t2 order by 2;
f1 ABC f1 ABC
my_sqrt 0 my_sqrt 0
f1 ABC f1 ABC
my_sqrt 1.73205080756888 my_sqrt 1.7320508075688772
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 AS SELECT * FROM v2; CREATE TABLE t2 AS SELECT * FROM v2;
Warnings: Warnings:
...@@ -22894,7 +22894,7 @@ SELECT * FROM t2 order by 2; ...@@ -22894,7 +22894,7 @@ SELECT * FROM t2 order by 2;
f1 ABC f1 ABC
my_sqrt 0 my_sqrt 0
f1 ABC f1 ABC
my_sqrt 1.73205080756888 my_sqrt 1.7320508075688772
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
DROP VIEW v1; DROP VIEW v1;
......
mysql-test/suite/funcs_1/r/memory_views.result
View file @ e8ccb2d5
...@@ -22826,7 +22826,7 @@ f1 f2 ...@@ -22826,7 +22826,7 @@ f1 f2
ABC 3 ABC 3
SELECT * FROM v1 order by 2; SELECT * FROM v1 order by 2;
f1 my_sqrt f1 my_sqrt
ABC 1.73205080756888 ABC 1.7320508075688772
ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30); ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
INSERT INTO t1 SET f1 = 'ABC', f2 = 'DEF'; INSERT INTO t1 SET f1 = 'ABC', f2 = 'DEF';
DESCRIBE t1; DESCRIBE t1;
...@@ -22844,7 +22844,7 @@ ABC DEF ...@@ -22844,7 +22844,7 @@ ABC DEF
SELECT * FROM v1 order by 2; SELECT * FROM v1 order by 2;
f1 my_sqrt f1 my_sqrt
ABC 0 ABC 0
ABC 1.73205080756888 ABC 1.7320508075688772
Warnings: Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
...@@ -22867,7 +22867,7 @@ my_sqrt double YES NULL ...@@ -22867,7 +22867,7 @@ my_sqrt double YES NULL
SELECT * FROM v2 order by 2; SELECT * FROM v2 order by 2;
f1 my_sqrt f1 my_sqrt
ABC 0 ABC 0
ABC 1.73205080756888 ABC 1.7320508075688772
Warnings: Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
...@@ -22878,7 +22878,7 @@ SELECT * FROM t2 order by 2; ...@@ -22878,7 +22878,7 @@ SELECT * FROM t2 order by 2;
f1 ABC f1 ABC
my_sqrt 0 my_sqrt 0
f1 ABC f1 ABC
my_sqrt 1.73205080756888 my_sqrt 1.7320508075688772
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 AS SELECT * FROM v1; CREATE TABLE t2 AS SELECT * FROM v1;
Warnings: Warnings:
...@@ -22887,7 +22887,7 @@ SELECT * FROM t2 order by 2; ...@@ -22887,7 +22887,7 @@ SELECT * FROM t2 order by 2;
f1 ABC f1 ABC
my_sqrt 0 my_sqrt 0
f1 ABC f1 ABC
my_sqrt 1.73205080756888 my_sqrt 1.7320508075688772
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 AS SELECT * FROM v2; CREATE TABLE t2 AS SELECT * FROM v2;
Warnings: Warnings:
...@@ -22896,7 +22896,7 @@ SELECT * FROM t2 order by 2; ...@@ -22896,7 +22896,7 @@ SELECT * FROM t2 order by 2;
f1 ABC f1 ABC
my_sqrt 0 my_sqrt 0
f1 ABC f1 ABC
my_sqrt 1.73205080756888 my_sqrt 1.7320508075688772
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
DROP VIEW v1; DROP VIEW v1;
......
mysql-test/suite/funcs_1/r/ndb_views.result
View file @ e8ccb2d5
...@@ -22824,7 +22824,7 @@ f1 f2 ...@@ -22824,7 +22824,7 @@ f1 f2
ABC 3 ABC 3
SELECT * FROM v1 order by 2; SELECT * FROM v1 order by 2;
f1 my_sqrt f1 my_sqrt
ABC 1.73205080756888 ABC 1.7320508075688772
ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30); ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
INSERT INTO t1 SET f1 = 'ABC', f2 = 'DEF'; INSERT INTO t1 SET f1 = 'ABC', f2 = 'DEF';
DESCRIBE t1; DESCRIBE t1;
...@@ -22842,7 +22842,7 @@ ABC DEF ...@@ -22842,7 +22842,7 @@ ABC DEF
SELECT * FROM v1 order by 2; SELECT * FROM v1 order by 2;
f1 my_sqrt f1 my_sqrt
ABC 0 ABC 0
ABC 1.73205080756888 ABC 1.7320508075688772
Warnings: Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
...@@ -22865,7 +22865,7 @@ my_sqrt double YES NULL ...@@ -22865,7 +22865,7 @@ my_sqrt double YES NULL
SELECT * FROM v2 order by 2; SELECT * FROM v2 order by 2;
f1 my_sqrt f1 my_sqrt
ABC 0 ABC 0
ABC 1.73205080756888 ABC 1.7320508075688772
Warnings: Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
Warning 1292 Truncated incorrect DOUBLE value: 'DEF' Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
...@@ -22876,7 +22876,7 @@ SELECT * FROM t2 order by 2; ...@@ -22876,7 +22876,7 @@ SELECT * FROM t2 order by 2;
f1 ABC f1 ABC
my_sqrt 0 my_sqrt 0
f1 ABC f1 ABC
my_sqrt 1.73205080756888 my_sqrt 1.7320508075688772
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 AS SELECT * FROM v1; CREATE TABLE t2 AS SELECT * FROM v1;
Warnings: Warnings:
...@@ -22885,7 +22885,7 @@ SELECT * FROM t2 order by 2; ...@@ -22885,7 +22885,7 @@ SELECT * FROM t2 order by 2;
f1 ABC f1 ABC
my_sqrt 0 my_sqrt 0
f1 ABC f1 ABC
my_sqrt 1.73205080756888 my_sqrt 1.7320508075688772
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 AS SELECT * FROM v2; CREATE TABLE t2 AS SELECT * FROM v2;
Warnings: Warnings:
...@@ -22894,7 +22894,7 @@ SELECT * FROM t2 order by 2; ...@@ -22894,7 +22894,7 @@ SELECT * FROM t2 order by 2;
f1 ABC f1 ABC
my_sqrt 0 my_sqrt 0
f1 ABC f1 ABC
my_sqrt 1.73205080756888 my_sqrt 1.7320508075688772
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
DROP VIEW v1; DROP VIEW v1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7