diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 13:39:17 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 13:39:17 +0200 |
| commit | 32c6f40a6319d493e5270c72ac5d27dc99d1b242 (patch) | |
| tree | 12dc5335b9e825c3d0dff7b57ff3b835e6121f4f /storage/connect/mysql-test | |
| parent | cf8c2a3c3b2eb05df419ce014b98a71b1e75ad6b (diff) | |
| parent | 2382cd14a8c96cf8b4375d7338abfa6e1b333a86 (diff) | |
| download | mariadb-git-32c6f40a6319d493e5270c72ac5d27dc99d1b242.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/connect/mysql-test')
| -rw-r--r-- | storage/connect/mysql-test/connect/disabled.def | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/storage/connect/mysql-test/connect/disabled.def b/storage/connect/mysql-test/connect/disabled.def index 827ed58b835..1de4deb0a60 100644 --- a/storage/connect/mysql-test/connect/disabled.def +++ b/storage/connect/mysql-test/connect/disabled.def @@ -9,15 +9,15 @@ # Do not use any TAB characters for whitespace. # ############################################################################## -infoschema-9739 : Crashes with MariaDB 10.0 -jdbc : Variable settings depend on machine configuration -jdbc_new : Variable settings depend on machine configuration -jdbc_oracle : Variable settings depend on machine configuration -jdbc_postgresql : Variable settings depend on machine configuration -json_mongo_c : Need MongoDB running and its C Driver installed -json_java_2 : Need MongoDB running and its Java Driver installed -json_java_3 : Need MongoDB running and its Java Driver installed -mongo_c : Need MongoDB running and its C Driver installed -mongo_java_2 : Need MongoDB running and its Java Driver installed -mongo_java_3 : Need MongoDB running and its Java Driver installed -tbl_thread : Bug MDEV-9844,10179,14214 03/01/2018 OB Option THREAD removed +jdbc : Variable settings depend on machine configuration +jdbc_new : Variable settings depend on machine configuration +jdbc_oracle : Variable settings depend on machine configuration +jdbc_postgresql : Variable settings depend on machine configuration +json_mongo_c : Need MongoDB running and its C Driver installed +json_java_2 : Need MongoDB running and its Java Driver installed +json_java_3 : Need MongoDB running and its Java Driver installed +mongo_c : Need MongoDB running and its C Driver installed +mongo_java_2 : Need MongoDB running and its Java Driver installed +mongo_java_3 : Need MongoDB running and its Java Driver installed +tbl_thread : Bug MDEV-9844,10179,14214 03/01/2018 OB Option THREAD removed +#vcol : Different error code on different versions |