summaryrefslogtreecommitdiff
path: root/scripts/mysql_system_tables.sql
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2020-01-13 21:07:04 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2020-02-13 13:42:01 +0200
commit45bc7574fba26f3f975379b73d80235081c4d397 (patch)
tree0cb57bc82a6e908c4c40f4ac913ae752de6c1d2f /scripts/mysql_system_tables.sql
parent415797f1a67d5281c4e585ac3dc82b10e5dcbd16 (diff)
downloadmariadb-git-45bc7574fba26f3f975379b73d80235081c4d397.tar.gz
MDEV-18650: Options deprecated in previous versions - storage_engine
Remove usage of deprecated variable storage_engine. It was deprecated in 5.5 but it never issued a deprecation warning. Make it issue a warning in 10.5.1. Replaced with default_storage_engine.
Diffstat (limited to 'scripts/mysql_system_tables.sql')
-rw-r--r--scripts/mysql_system_tables.sql6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index 29f2a4c1ef6..34f552a3f35 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -20,8 +20,8 @@
set sql_mode='';
-set @orig_storage_engine=@@storage_engine;
-set storage_engine=Aria;
+set @orig_storage_engine=@@default_storage_engine;
+set default_storage_engine=Aria;
set system_versioning_alter_history=keep;
@@ -313,7 +313,7 @@ PREPARE stmt FROM @str;
EXECUTE stmt;
DROP PREPARE stmt;
-set storage_engine=@orig_storage_engine;
+set default_storage_engine=@orig_storage_engine;
--
-- Drop some tables not used anymore in MariaDB