summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-06-21 13:44:16 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-06-21 13:44:16 +0300
commit2a3fe45dd2df047cc0d66e2bcdbadd5005c85a1a (patch)
tree0d00d4685c60baa325d12d5103fbf72253682bbc /sql/mysqld.cc
parent99e017d09945d04e8f43d3b74ecc556e809613a2 (diff)
downloadmariadb-git-2a3fe45dd2df047cc0d66e2bcdbadd5005c85a1a.tar.gz
Remove XtraDB
The XtraDB storage engine was already replaced by InnoDB and disabled in MariaDB Server 10.2. Let us remove it altogether to avoid dragging dead code around. Replace some references to XtraDB with references to InnoDB. rpl_get_position_info(): Remove. Remove the mysql-test-run --suite=percona, because it only contains tests specific to XtraDB, many of which were disabled already in earlier MariaDB versions.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 6da1bd75531..b8e0b44843c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4252,7 +4252,7 @@ static int init_common_variables()
(except in the embedded server, where the default continues to
be MyISAM)
*/
-#if defined(WITH_INNOBASE_STORAGE_ENGINE) || defined(WITH_XTRADB_STORAGE_ENGINE)
+#if defined(WITH_INNOBASE_STORAGE_ENGINE)
default_storage_engine= const_cast<char *>("InnoDB");
#else
default_storage_engine= const_cast<char *>("MyISAM");