diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-04-15 09:16:54 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-04-15 09:16:54 -0700 |
| commit | f4cd2b37b12617ca383e625dfd07ce1468c5b5a8 (patch) | |
| tree | 4720b59562af2f8a4208b3cce4dca649d05b029b /scripts | |
| parent | ab10dc8fafc3ff5448947e698b500bab4042e95e (diff) | |
| parent | 30b2c64c4e87f8924fe817f5c607ae90a990e9e5 (diff) | |
| download | mariadb-git-f4cd2b37b12617ca383e625dfd07ce1468c5b5a8.tar.gz | |
Merge 10.0-base -> mwl253
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 3 | ||||
| -rw-r--r-- | scripts/mysql_system_tables.sql | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 241cb84a399..0f6eebf626e 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -416,9 +416,8 @@ mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}" mysqld_install_cmd_line() { "$mysqld_bootstrap" $defaults "$mysqld_opt" --bootstrap \ - "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 --loose-skip-innodb \ + "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 \ --loose-skip-ndbcluster --loose-skip-pbxt $args --max_allowed_packet=8M \ - --default-storage-engine=myisam \ --net_buffer_length=16K } diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index 9872da88cff..95f2741f90d 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -20,6 +20,12 @@ -- set sql_mode=''; + +-- We want this to be created with the default storage engine. +-- This way, if InnoDB is used we get crash safety, and if MyISAM is used +-- we avoid mixed-engine transactions. +CREATE TABLE IF NOT EXISTS rpl_slave_state (domain_id INT UNSIGNED NOT NULL, sub_id BIGINT UNSIGNED NOT NULL, server_id INT UNSIGNED NOT NULL, seq_no BIGINT UNSIGNED NOT NULL, PRIMARY KEY (domain_id, sub_id)) comment='Replication slave GTID state'; + set storage_engine=myisam; flush tables; |