diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 13:39:13 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 13:39:13 +0000 |
commit | 86fbb58c3ac0865482819c10a3e81f2eea001c36 (patch) | |
tree | 28c9e526ea739c6f9b89e36115e1e2698bddf981 /mysql-test/main/mysql_json_mysql_upgrade.test | |
parent | Releasing progress-linux version 1:10.11.6-2~progress7.99u1. (diff) | |
download | mariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.tar.xz mariadb-86fbb58c3ac0865482819c10a3e81f2eea001c36.zip |
Merging upstream version 1:10.11.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mysql-test/main/mysql_json_mysql_upgrade.test')
-rw-r--r-- | mysql-test/main/mysql_json_mysql_upgrade.test | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/mysql-test/main/mysql_json_mysql_upgrade.test b/mysql-test/main/mysql_json_mysql_upgrade.test deleted file mode 100644 index 4380b004..00000000 --- a/mysql-test/main/mysql_json_mysql_upgrade.test +++ /dev/null @@ -1,36 +0,0 @@ ---echo # ---echo # MDEV-24093: Detect during mysql_upgrade if type_mysql_json.so ---echo # is needed and load it ---echo # - --- source include/have_utf8.inc --- source include/mysql_upgrade_preparation.inc - -if (!$TYPE_MYSQL_JSON_SO) { - skip Need MYSQL_JSON plugin; -} - -SET NAMES utf8; - -let $MYSQLD_DATADIR= `select @@datadir`; - ---copy_file std_data/mysql_json/mysql_json_test.frm $MYSQLD_DATADIR/test/mysql_json_test.frm ---copy_file std_data/mysql_json/mysql_json_test.MYI $MYSQLD_DATADIR/test/mysql_json_test.MYI ---copy_file std_data/mysql_json/mysql_json_test.MYD $MYSQLD_DATADIR/test/mysql_json_test.MYD - ---copy_file std_data/mysql_json/mysql_json_test_big.frm $MYSQLD_DATADIR/test/mysql_json_test_big.frm ---copy_file std_data/mysql_json/mysql_json_test_big.MYI $MYSQLD_DATADIR/test/mysql_json_test_big.MYI ---copy_file std_data/mysql_json/mysql_json_test_big.MYD $MYSQLD_DATADIR/test/mysql_json_test_big.MYD - ---error ER_UNKNOWN_DATA_TYPE -show create table mysql_json_test; - ---exec $MYSQL_UPGRADE --force 2>&1 ---remove_file $MYSQLD_DATADIR/mysql_upgrade_info - -show create table mysql_json_test; -select * from mysql_json_test; -show create table mysql_json_test_big; -select * from mysql.plugin; -drop table mysql_json_test; -drop table mysql_json_test_big; |