bzr commit into mysql-trunk branch (magne.mahre:3017) WL#5349

[Magne Mahre]

#At file:///export/home/tmp/x/mysql-trunk-wl5349/ based on revid:magne.mahre@stripped

 3017 Magne Mahre	2010-05-25
      WL#5349 Change default storage engine to InnoDB
      
      Modification of result files for  tests that check 
      innodb_file_format (as the default has changed from
      Antelope to Barracuda)

    modified:
      mysql-test/suite/innodb/r/innodb_file_format.result
      mysql-test/suite/sys_vars/r/innodb_file_format_basic.result
      mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
      mysql-test/suite/sys_vars/r/storage_engine_basic.result
=== modified file 'mysql-test/suite/innodb/r/innodb_file_format.result'
--- a/mysql-test/suite/innodb/r/innodb_file_format.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/innodb/r/innodb_file_format.result	2010-05-25 08:44:47 +0000
@@ -1,7 +1,7 @@
 call mtr.add_suppression("InnoDB: invalid innodb_file_format_check value");
 select @@innodb_file_format;
 @@innodb_file_format
-Antelope
+Barracuda
 select @@innodb_file_format_check;
 @@innodb_file_format_check
 Antelope
@@ -15,14 +15,14 @@ Barracuda
 set global innodb_file_format=default;
 select @@innodb_file_format;
 @@innodb_file_format
-Antelope
+Barracuda
 set global innodb_file_format=on;
 ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON'
 set global innodb_file_format=off;
 ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off'
 select @@innodb_file_format;
 @@innodb_file_format
-Antelope
+Barracuda
 set global innodb_file_format_check=antelope;
 set global innodb_file_format_check=barracuda;
 set global innodb_file_format_check=cheetah;

=== modified file 'mysql-test/suite/sys_vars/r/innodb_file_format_basic.result'
--- a/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result	2010-01-29 06:33:00 +0000
+++ b/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result	2010-05-25 08:44:47 +0000
@@ -1,28 +1,28 @@
 SET @start_global_value = @@global.innodb_file_format;
 SELECT @start_global_value;
 @start_global_value
-Antelope
+Barracuda
 Valid values are 'Antelope' and 'Barracuda' 
 select @@global.innodb_file_format in ('Antelope', 'Barracuda');
 @@global.innodb_file_format in ('Antelope', 'Barracuda')
 1
 select @@global.innodb_file_format;
 @@global.innodb_file_format
-Antelope
+Barracuda
 select @@session.innodb_file_format;
 ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable
 show global variables like 'innodb_file_format';
 Variable_name	Value
-innodb_file_format	Antelope
+innodb_file_format	Barracuda
 show session variables like 'innodb_file_format';
 Variable_name	Value
-innodb_file_format	Antelope
+innodb_file_format	Barracuda
 select * from information_schema.global_variables where variable_name='innodb_file_format';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_FILE_FORMAT	Antelope
+INNODB_FILE_FORMAT	Barracuda
 select * from information_schema.session_variables where variable_name='innodb_file_format';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_FILE_FORMAT	Antelope
+INNODB_FILE_FORMAT	Barracuda
 set global innodb_file_format='Antelope';
 select @@global.innodb_file_format;
 @@global.innodb_file_format
@@ -56,4 +56,4 @@ ERROR 42000: Variable 'innodb_file_forma
 SET @@global.innodb_file_format = @start_global_value;
 SELECT @@global.innodb_file_format;
 @@global.innodb_file_format
-Antelope
+Barracuda

=== modified file 'mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result'
--- a/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result	2010-01-29 06:33:00 +0000
+++ b/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result	2010-05-25 08:44:47 +0000
@@ -1,32 +1,32 @@
 SET @start_global_value = @@global.innodb_strict_mode;
 SELECT @start_global_value;
 @start_global_value
-0
+1
 Valid values are 'ON' and 'OFF' 
 select @@global.innodb_strict_mode in (0, 1);
 @@global.innodb_strict_mode in (0, 1)
 1
 select @@global.innodb_strict_mode;
 @@global.innodb_strict_mode
-0
+1
 select @@session.innodb_strict_mode in (0, 1);
 @@session.innodb_strict_mode in (0, 1)
 1
 select @@session.innodb_strict_mode;
 @@session.innodb_strict_mode
-0
+1
 show global variables like 'innodb_strict_mode';
 Variable_name	Value
-innodb_strict_mode	OFF
+innodb_strict_mode	ON
 show session variables like 'innodb_strict_mode';
 Variable_name	Value
-innodb_strict_mode	OFF
+innodb_strict_mode	ON
 select * from information_schema.global_variables where variable_name='innodb_strict_mode';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_STRICT_MODE	OFF
+INNODB_STRICT_MODE	ON
 select * from information_schema.session_variables where variable_name='innodb_strict_mode';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_STRICT_MODE	OFF
+INNODB_STRICT_MODE	ON
 set global innodb_strict_mode='OFF';
 set session innodb_strict_mode='OFF';
 select @@global.innodb_strict_mode;
@@ -117,4 +117,4 @@ INNODB_STRICT_MODE	ON
 SET @@global.innodb_strict_mode = @start_global_value;
 SELECT @@global.innodb_strict_mode;
 @@global.innodb_strict_mode
-0
+1

=== modified file 'mysql-test/suite/sys_vars/r/storage_engine_basic.result'
--- a/mysql-test/suite/sys_vars/r/storage_engine_basic.result	2009-12-22 11:02:52 +0000
+++ b/mysql-test/suite/sys_vars/r/storage_engine_basic.result	2010-05-25 08:44:47 +0000
@@ -1,22 +1,22 @@
 SET @start_global_value = @@global.storage_engine;
 SELECT @start_global_value;
 @start_global_value
-MyISAM
+InnoDB
 SET @start_session_value = @@session.storage_engine;
 SELECT @start_session_value;
 @start_session_value
-MyISAM
+InnoDB
 '#--------------------FN_DYNVARS_005_01-------------------------#'
 SET @@global.storage_engine = INNODB;
 SET @@global.storage_engine = DEFAULT;
 SELECT @@global.storage_engine;
 @@global.storage_engine
-MyISAM
+InnoDB
 SET @@session.storage_engine = INNODB;
 SET @@session.storage_engine = DEFAULT;
 SELECT @@session.storage_engine;
 @@session.storage_engine
-MyISAM
+InnoDB
 '#--------------------FN_DYNVARS_005_02-------------------------#'
 SET @@global.storage_engine = MYISAM;
 SELECT @@global.storage_engine;
@@ -110,8 +110,8 @@ SET @@storage_engine = @start_global_val
 SET @@global.storage_engine = @start_global_value;
 SELECT @@global.storage_engine;
 @@global.storage_engine
-MyISAM
+InnoDB
 SET @@session.storage_engine = @start_session_value;
 SELECT @@session.storage_engine;
 @@session.storage_engine
-MyISAM
+InnoDB


Attachment: [text/bzr-bundle] bzr/[e-mail]