Fix for the latest instability found within funcs_1: ndb_views

Bug#31237 Test "ndb_views" fails because of differing order of select results


mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated results
mysql-test/suite/funcs_1/views/views_master.inc:
  Mangle the row numbers
This commit is contained in:
unknown 2008-05-05 19:49:17 +02:00
parent ef32ec61de
commit 2d7b51922a
5 changed files with 11 additions and 8 deletions

View file

@ -22497,8 +22497,8 @@ f1 f2 f4 report
2 NULL <-- 10 --> v1 2
ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
Warnings:
Warning 1265 Data truncated for column 'f4' at row 4
Warning 1265 Data truncated for column 'f4' at row 5
Warning 1265 Data truncated for column 'f4' at row <some number>
Warning 1265 Data truncated for column 'f4' at row <some number>
INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
Warnings:
Warning 1265 Data truncated for column 'f4' at row 1

View file

@ -22498,8 +22498,8 @@ f1 f2 f4 report
2 NULL <-- 10 --> v1 2
ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
Warnings:
Warning 1265 Data truncated for column 'f4' at row 4
Warning 1265 Data truncated for column 'f4' at row 5
Warning 1265 Data truncated for column 'f4' at row <some number>
Warning 1265 Data truncated for column 'f4' at row <some number>
INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
Warnings:
Warning 1265 Data truncated for column 'f4' at row 1

View file

@ -24200,8 +24200,8 @@ f1 f2 f4 report
2 NULL <-- 10 --> v1 2
ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
Warnings:
Warning 1265 Data truncated for column 'f4' at row 4
Warning 1265 Data truncated for column 'f4' at row 5
Warning 1265 Data truncated for column 'f4' at row <some number>
Warning 1265 Data truncated for column 'f4' at row <some number>
INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
Warnings:
Warning 1265 Data truncated for column 'f4' at row 1

View file

@ -22496,8 +22496,8 @@ f1 f2 f4 report
2 NULL <-- 10 --> v1 2
ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
Warnings:
Warning 1265 Data truncated for column 'f4' at row 2
Warning 1265 Data truncated for column 'f4' at row 5
Warning 1265 Data truncated for column 'f4' at row <some number>
Warning 1265 Data truncated for column 'f4' at row <some number>
INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
Warnings:
Warning 1265 Data truncated for column 'f4' at row 1

View file

@ -3903,6 +3903,9 @@ SELECT * FROM t1 order by f1, report;
SELECT * FROM v1 order by f1, report;
#
# 3. Length of one base table column is reduced
# We have to mangle within warnings the row numbers, because they are not
# deterministic in case of NDB.
--replace_regex /at row [0-9]/at row <some number>/
ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
INSERT INTO v1 SET f1 = 3, f4 = '<-- 10 -->', report = 'v1 3';