MDEV-220 MariaDB server 5.5 GA candidate has default storage engine MyISAM
This commit is contained in:
parent
5f68269abe
commit
edfcb97a61
@ -589,6 +589,8 @@
|
||||
#cmakedefine WITH_MYISAM_STORAGE_ENGINE 1
|
||||
#cmakedefine WITH_MYISAMMRG_STORAGE_ENGINE 1
|
||||
#cmakedefine WITH_HEAP_STORAGE_ENGINE 1
|
||||
#cmakedefine WITH_INNOBASE_STORAGE_ENGINE 1
|
||||
#cmakedefine WITH_XTRADB_STORAGE_ENGINE 1
|
||||
#cmakedefine WITH_CSV_STORAGE_ENGINE 1
|
||||
#cmakedefine WITH_PARTITION_STORAGE_ENGINE 1
|
||||
#cmakedefine WITH_PERFSCHEMA_STORAGE_ENGINE 1
|
||||
|
@ -60,6 +60,8 @@ loose-performance-schema-max-table-handles=1000
|
||||
|
||||
binlog-direct-non-transactional-updates
|
||||
|
||||
default-storage-engine=myisam
|
||||
|
||||
# here, at the end of [mysqld] group mtr will automatically disable
|
||||
# all optional plugins.
|
||||
|
||||
|
1
mysql-test/r/default_storage_engine.result
Normal file
1
mysql-test/r/default_storage_engine.result
Normal file
@ -0,0 +1 @@
|
||||
"all ok"
|
16
mysql-test/t/default_storage_engine.test
Normal file
16
mysql-test/t/default_storage_engine.test
Normal file
@ -0,0 +1,16 @@
|
||||
if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'innodb' AND PLUGIN_LIBRARY IS NULL`)
|
||||
{
|
||||
--skip Requires built-in InnoDB.
|
||||
}
|
||||
|
||||
let $cmd=`select replace("$MYSQLD_BOOTSTRAP_CMD", " --default-storage-engine=myisam", "")`;
|
||||
|
||||
#
|
||||
# Now it *must* fail, because if InnoDB is compiled in, it is used as a default
|
||||
# storage engine. but $MYSQLD_BOOTSTRAP_CMD includes --skip-innodb
|
||||
#
|
||||
error 1;
|
||||
exec $cmd;
|
||||
|
||||
echo "all ok"; # to not have zero-length result file
|
||||
|
@ -3491,10 +3491,10 @@ static int init_common_variables()
|
||||
(except in the embedded server, where the default continues to
|
||||
be MyISAM)
|
||||
*/
|
||||
#ifndef WITH_INNOBASE_STORAGE_ENGINE
|
||||
default_storage_engine= const_cast<char *>("MyISAM");
|
||||
#else
|
||||
#if defined(WITH_INNOBASE_STORAGE_ENGINE) || defined(WITH_XTRADB_STORAGE_ENGINE)
|
||||
default_storage_engine= const_cast<char *>("InnoDB");
|
||||
#else
|
||||
default_storage_engine= const_cast<char *>("MyISAM");
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
Loading…
x
Reference in New Issue
Block a user