Update test results: make innodb_ext_key test stable

MariaDB · Jul 13, 2016 · 12ac3ee · 12ac3ee
1 parent bebabd6
commit 12ac3ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/mysql-test/r/innodb_ext_key.result b/mysql-test/r/innodb_ext_key.result
@@ -1059,10 +1059,6 @@ concat('1234567890-', 1000+ A.a + 10*B.a + 100*C.a),
 repeat('filler-data-', 4)
 from 
 t0 A, t0 B, t0 C;
-# The following must use type=ALL (and NOT type=ref, rows=1)
-explain select * from t1 where col1='1234567890-a';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	idx1	NULL	NULL	NULL	#	Using where
 drop table t0,t1;
 # 
 # MDEV-10360: Extended keys: index properties depend on index order

diff --git a/mysql-test/t/innodb_ext_key.test b/mysql-test/t/innodb_ext_key.test
@@ -715,9 +715,13 @@ select
 from 
   t0 A, t0 B, t0 C;
 
---echo # The following must use type=ALL (and NOT type=ref, rows=1)
---replace_column 9 #
-explain select * from t1 where col1='1234567890-a';
+let $q=explain select * from t1 where col1='1234567890-a';
+let $rows=query_get_value($q, rows, 1);
+if ($rows < 2)
+{
+  --echo The EXPLAIN should not produce a query plan with type=ref, rows=1
+  --die Fix for MDEV-10325 didnt work;
+}
 
 drop table t0,t1;