diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-02-11 09:45:34 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-11 09:45:34 +0100 |
commit | f3914d10b61eb4bc4184b2a9aa92a998e1abd779 (patch) | |
tree | 0f973c0dc2fb1f667ed852e4177b17938e28b6b9 /storage/connect/mysql-test/connect/disabled.def | |
parent | 559345806216369bad999539018bd3943860a5d5 (diff) | |
parent | 2195bb4e416232ab807ff67eecf03b1223bf6bff (diff) | |
download | mariadb-git-f3914d10b61eb4bc4184b2a9aa92a998e1abd779.tar.gz |
Merge branch 'bb-10.2-serg-merge' into 10.2
Diffstat (limited to 'storage/connect/mysql-test/connect/disabled.def')
-rw-r--r-- | storage/connect/mysql-test/connect/disabled.def | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/mysql-test/connect/disabled.def b/storage/connect/mysql-test/connect/disabled.def index 64d7ece3fe1..0e5a5fc64e3 100644 --- a/storage/connect/mysql-test/connect/disabled.def +++ b/storage/connect/mysql-test/connect/disabled.def @@ -9,8 +9,8 @@ # Do not use any TAB characters for whitespace. # ############################################################################## -jdbc : Variable settings depend on machine configuration -jdbc_new : Variable settings depend on machine configuration +#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 : TABLE_TYPE = JSON conflicts with the SQL syntax |