Skip to content

Commit ba8ab6a

Browse files
committed
Adjusted tests after the fix for bug mdev-9976.
Now ROWS is a reserved key word, so cannot be used as an alias name.
1 parent 9073f9f commit ba8ab6a

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

mysql-test/suite/parts/r/partition_repair_myisam.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ PARTITIONS 7;
270270
SELECT COUNT(*) FROM t1_will_crash;
271271
COUNT(*)
272272
33
273-
SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
274-
partition rows
273+
SELECT (b % 7) AS `partition`, COUNT(*) AS rows_cnt FROM t1_will_crash GROUP BY (b % 7);
274+
partition rows_cnt
275275
0 2
276276
1 5
277277
2 5
@@ -343,8 +343,8 @@ test.t1_will_crash repair status OK
343343
SELECT COUNT(*) FROM t1_will_crash;
344344
COUNT(*)
345345
29
346-
SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
347-
partition rows
346+
SELECT (b % 7) AS `partition`, COUNT(*) AS rows_cnt FROM t1_will_crash GROUP BY (b % 7);
347+
partition rows_cnt
348348
1 4
349349
2 5
350350
3 5
@@ -483,8 +483,8 @@ test.t1_will_crash repair status OK
483483
SELECT COUNT(*) FROM t1_will_crash;
484484
COUNT(*)
485485
29
486-
SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
487-
partition rows
486+
SELECT (b % 7) AS `partition`, COUNT(*) AS rows_cnt FROM t1_will_crash GROUP BY (b % 7);
487+
partition rows_cnt
488488
1 4
489489
2 4
490490
3 5

mysql-test/suite/parts/t/partition_repair_myisam.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ eval INSERT INTO t1_will_crash VALUES
190190
('6 row 7 (crash before completely written to datafile)', 27, '$lt$lt');
191191
--enable_query_log
192192
SELECT COUNT(*) FROM t1_will_crash;
193-
SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
193+
SELECT (b % 7) AS `partition`, COUNT(*) AS rows_cnt FROM t1_will_crash GROUP BY (b % 7);
194194
SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash ORDER BY `partition`, b, a;
195195
FLUSH TABLES;
196196
# testing p0, p1, p3, p6(1)
@@ -216,7 +216,7 @@ OPTIMIZE TABLE t1_will_crash;
216216
CHECK TABLE t1_will_crash;
217217
REPAIR TABLE t1_will_crash;
218218
SELECT COUNT(*) FROM t1_will_crash;
219-
SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
219+
SELECT (b % 7) AS `partition`, COUNT(*) AS rows_cnt FROM t1_will_crash GROUP BY (b % 7);
220220
SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash ORDER BY `partition`, b, a;
221221
FLUSH TABLES;
222222

@@ -282,7 +282,7 @@ SET @@optimizer_switch=@save_optimizer_switch;
282282
ALTER TABLE t1_will_crash CHECK PARTITION p6;
283283
ALTER TABLE t1_will_crash REPAIR PARTITION p6;
284284
SELECT COUNT(*) FROM t1_will_crash;
285-
SELECT (b % 7) AS `partition`, COUNT(*) AS rows FROM t1_will_crash GROUP BY (b % 7);
285+
SELECT (b % 7) AS `partition`, COUNT(*) AS rows_cnt FROM t1_will_crash GROUP BY (b % 7);
286286
SELECT (b % 7) AS `partition`, b, a, length(c) FROM t1_will_crash ORDER BY `partition`, b, a;
287287
ALTER TABLE t1_will_crash CHECK PARTITION all EXTENDED;
288288
DROP TABLE t1_will_crash;

0 commit comments

Comments
 (0)