summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-09-26 20:49:51 +0200
committerSergei Golubchik <serg@mariadb.org>2018-09-28 16:37:06 +0200
commit57e0da50bbef8164635317785b67dd468a908327 (patch)
tree89d1ed179afce8b040c8f2dfcfe179042ff27b2e /mysql-test/collections
parent7aba6f8f8853acd18d471793f8b72aa1412b8151 (diff)
parentdcbd51cee628d8d8fec9ff5476a6afc855b007aa (diff)
downloadmariadb-git-57e0da50bbef8164635317785b67dd468a908327.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/collections')
-rw-r--r--mysql-test/collections/10.0-compatible.list8
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/collections/10.0-compatible.list b/mysql-test/collections/10.0-compatible.list
index 415c74ab00c..4778bde3b78 100644
--- a/mysql-test/collections/10.0-compatible.list
+++ b/mysql-test/collections/10.0-compatible.list
@@ -1,3 +1,5 @@
+# All lines which have a hash sign *anywhere* will be ignored
+
main.1st
main.adddate_454
main.almost_full
@@ -500,7 +502,8 @@ main.subselect-crash_15755
main.subselect_exists2in
main.subselect_exists2in_costmat
main.subselect_extra
-main.subselect_extra_no_semijoin
+# Disabled due to connect log output
+# main.subselect_extra_no_semijoin
main.subselect_gis
main.subselect_innodb
main.subselect_mat
@@ -579,7 +582,8 @@ main.win_empty_over
main.win_first_last_value
main.win_insert_select
main.win_i_s
-main.win_lead_lag
+# Disabled due to unknown SQL error name
+# main.win_lead_lag
main.win_min_max
main.win_nth_value
main.win_orderby