summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysql_upgrade_noengine.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-01-27 08:45:36 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2022-01-27 08:45:36 +0100
commit9b4a179d69a1c795bef303a88f9d3195669f00ec (patch)
tree87811d81af231e2945468ead0cba58cfc5514548 /mysql-test/main/mysql_upgrade_noengine.result
parent020dc54dabe64f238e8ef4f50a630a22e0f06949 (diff)
parent7db489fc7dea2b4c236807035e57f169074c6682 (diff)
downloadmariadb-git-10.3-merge.tar.gz
Merge branch '10.2' into bb-10.3-release10.3-merge
Diffstat (limited to 'mysql-test/main/mysql_upgrade_noengine.result')
-rw-r--r--mysql-test/main/mysql_upgrade_noengine.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/main/mysql_upgrade_noengine.result b/mysql-test/main/mysql_upgrade_noengine.result
index 7b3b1610ee0..8bd82dce7af 100644
--- a/mysql-test/main/mysql_upgrade_noengine.result
+++ b/mysql-test/main/mysql_upgrade_noengine.result
@@ -53,6 +53,7 @@ Warnings:
Level Warning
Code 1286
Message Unknown storage engine 'ARCHIVE'
+# upgrade from 10.1 - engines aren't enabled
Phase 1/7: Checking and upgrading mysql database
Processing databases
mysql
@@ -142,6 +143,8 @@ Level Warning
Code 1286
Message Unknown storage engine 'ARCHIVE'
alter table mysql.user drop column default_role, drop column max_statement_time;
+# still upgrade from 10.1
+Major version upgrade detected from MariaDB to MariaDB . Check required!
Phase 1/7: Checking and upgrading mysql database
Processing databases
mysql
@@ -231,6 +234,7 @@ Level Warning
Code 1286
Message Unknown storage engine 'ARCHIVE'
alter table mysql.user drop column default_role, drop column max_statement_time;
+# upgrade from 10.0 - engines are enabled
Phase 1/7: Checking and upgrading mysql database
Processing databases
mysql