diff options
author | Magne Mahre <magne.mahre@sun.com> | 2010-06-17 22:51:35 +0200 |
---|---|---|
committer | Magne Mahre <magne.mahre@sun.com> | 2010-06-17 22:51:35 +0200 |
commit | 3ac6a4b451f61b8edf9cb326111157a86f1bdc1c (patch) | |
tree | 5fc808292f57595d6888419842089d5d6c4311ab /mysql-test/mysql-test-run.pl | |
parent | 95c86d14b5bf4316b2eb7ec6fb26dc24640a038e (diff) | |
download | mariadb-git-3ac6a4b451f61b8edf9cb326111157a86f1bdc1c.tar.gz |
WL#5349 Change default storage engine to InnoDB
The default storage engine is changed from MyISAM to
InnoDB, in all builds except for the embedded server.
In addition, the following system variables are
changed:
* innodb_file_per_table is enabled
* innodb_strict_mode is enabled
* innodb_file_format_name_update is changed
to 'Barracuda'
The test suite is changed so that tests that do not
explicitly include the have_innodb.inc are run with
--default-storage-engine=MyISAM. This is to ease the
transition, so that most regression tests are run
with the same engine as before.
Some tests are disabled for the embedded server
regression test, as the output of certain statements
will be different that for the regular server
(i.e SELECT @@default_storage_engine). This is to
ease transition.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 23a92828e2a..acb5fa3ed0f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -944,6 +944,7 @@ sub command_line_setup { 'timestamp' => \&report_option, 'timediff' => \&report_option, 'max-connections=i' => \$opt_max_connections, + 'default-myisam!' => \&collect_option, 'help|h' => \$opt_usage, 'list-options' => \$opt_list_options, @@ -2843,7 +2844,6 @@ sub mysql_install_db { mtr_add_arg($args, "--bootstrap"); mtr_add_arg($args, "--basedir=%s", $install_basedir); mtr_add_arg($args, "--datadir=%s", $install_datadir); - mtr_add_arg($args, "--loose-innodb=OFF"); mtr_add_arg($args, "--loose-skip-falcon"); mtr_add_arg($args, "--loose-skip-ndbcluster"); mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/"); @@ -5560,7 +5560,9 @@ Misc options timediff With --timestamp, also print time passed since *previous* test started max-connections=N Max number of open connection to server in mysqltest - + default-myisam Set default storage engine to MyISAM for non-innodb + tests. This is needed after switching default storage + engine to InnoDB. HERE exit(1); |