summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysql_json_table_recreate.test
diff options
context:
space:
mode:
authorAnel Husakovic <anel@mariadb.org>2021-01-20 21:59:51 +0100
committerAnel Husakovic <anel@mariadb.org>2021-01-28 19:01:32 +0100
commit85130c5a4ff4cc3854192bf7945cb10087d860a2 (patch)
treed7ddbee62447c30529272645850c87d756c5d577 /mysql-test/main/mysql_json_table_recreate.test
parent6d1f1b61b59310027698a92ccf533a3093f1ce04 (diff)
downloadmariadb-git-85130c5a4ff4cc3854192bf7945cb10087d860a2.tar.gz
MDEV-24093: Detect during mysql_upgrade if type_mysql_json.so is needed and load it
a. The change makes `mariadb-upgrade` detect if `MYSQL_JSON` data type is needed. b. Install the data type if it's not installed. c. Uninstalls the data type once finished. d. Create `.opt` and `.inc` files `have_type_mysql_json` and adapt the tests Reviewed by: vicentiu@mariadb.org
Diffstat (limited to 'mysql-test/main/mysql_json_table_recreate.test')
-rw-r--r--mysql-test/main/mysql_json_table_recreate.test5
1 files changed, 1 insertions, 4 deletions
diff --git a/mysql-test/main/mysql_json_table_recreate.test b/mysql-test/main/mysql_json_table_recreate.test
index de1e9202985..a399b546591 100644
--- a/mysql-test/main/mysql_json_table_recreate.test
+++ b/mysql-test/main/mysql_json_table_recreate.test
@@ -1,8 +1,5 @@
--source include/have_utf8.inc
-
-if (!$TYPE_MYSQL_JSON_SO) {
- skip Need MYSQL_JSON plugin;
-}
+--source include/have_type_mysql_json.inc
--echo #
--echo # The following test takes 2 tables containing a JSON column and attempts