summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-02-12 14:03:25 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-02-12 14:03:25 +0200
commitda3211e48743d143224ddc2334ac8a01942ecae7 (patch)
treeaf0a119591bf5e152093b446526c9708ab400b2f
parent6f3f191cfa434f1be71b42747769114ba31ae567 (diff)
downloadmariadb-git-da3211e48743d143224ddc2334ac8a01942ecae7.tar.gz
MDEV-24763 fixup: Use deterministic ORDER BY
-rw-r--r--mysql-test/suite/innodb/r/alter_table.result2
-rw-r--r--mysql-test/suite/innodb/t/alter_table.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/alter_table.result b/mysql-test/suite/innodb/r/alter_table.result
index ba99119f130..46162c167da 100644
--- a/mysql-test/suite/innodb/r/alter_table.result
+++ b/mysql-test/suite/innodb/r/alter_table.result
@@ -79,7 +79,7 @@ ALTER TABLE t1 CHANGE COLUMN a u INT;
SELECT sf.* FROM information_schema.innodb_sys_fields sf
INNER JOIN information_schema.innodb_sys_indexes si ON sf.index_id=si.index_id
INNER JOIN information_schema.innodb_sys_tables st ON si.table_id=st.table_id
-WHERE st.name='test/t1' ORDER BY pos;
+WHERE st.name='test/t1' ORDER BY sf.index_id,sf.pos;
INDEX_ID NAME POS
ID b 0
ID c 0
diff --git a/mysql-test/suite/innodb/t/alter_table.test b/mysql-test/suite/innodb/t/alter_table.test
index a17b1099dda..5c06388cdba 100644
--- a/mysql-test/suite/innodb/t/alter_table.test
+++ b/mysql-test/suite/innodb/t/alter_table.test
@@ -90,7 +90,7 @@ ALTER TABLE t1 CHANGE COLUMN a u INT;
SELECT sf.* FROM information_schema.innodb_sys_fields sf
INNER JOIN information_schema.innodb_sys_indexes si ON sf.index_id=si.index_id
INNER JOIN information_schema.innodb_sys_tables st ON si.table_id=st.table_id
-WHERE st.name='test/t1' ORDER BY pos;
+WHERE st.name='test/t1' ORDER BY sf.index_id,sf.pos;
DROP TABLE t1;
--echo # End of 10.2 tests