summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/r/innodb_bug53591.result
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@sun.com>2010-06-17 22:51:35 +0200
committerMagne Mahre <magne.mahre@sun.com>2010-06-17 22:51:35 +0200
commit32b7e60e42d5b0c9d3eae042bde066b5662b998e (patch)
tree5fc808292f57595d6888419842089d5d6c4311ab /mysql-test/suite/innodb/r/innodb_bug53591.result
parentdc00b5dbb221cbe743169d8a952183e2d36c2cea (diff)
downloadmariadb-git-32b7e60e42d5b0c9d3eae042bde066b5662b998e.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. mysql-test/mysql-test-run.pl: The regression test suite now adds a --default-storage-engine=MyISAM for all non-innodb tests. This behaviour can be controlled by the default-myisam switch in mysql-test-run mysql-test/t/bootstrap-master.opt: The bootstrap test can only be run without InnoDB as it starts several mysqld instances on the same datadir. This is possible with MyISAM, but not with InnoDB. storage/innobase/CMakeLists.txt: Build InnoDB per default storage/innobase/handler/ha_innodb.cc: Change default values for system variables Enable file_per_table Enable strict_mode Upgrade default file format to Barracuda
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb_bug53591.result')
-rw-r--r--mysql-test/suite/innodb/r/innodb_bug53591.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_bug53591.result b/mysql-test/suite/innodb/r/innodb_bug53591.result
index d3f8dfeafc2..8573fb60718 100644
--- a/mysql-test/suite/innodb/r/innodb_bug53591.result
+++ b/mysql-test/suite/innodb/r/innodb_bug53591.result
@@ -11,6 +11,6 @@ Error 139 Too big row
Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
Error 1030 Got error 139 from storage engine
DROP TABLE bug53591;
-SET GLOBAL innodb_file_format=Antelope;
+SET GLOBAL innodb_file_format=Barracuda;
SET GLOBAL innodb_file_format_max=Antelope;
-SET GLOBAL innodb_file_per_table=0;
+SET GLOBAL innodb_file_per_table=1;