List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:October 7 2010 11:44am
Subject:bzr commit into mysql-5.5-bugteam branch (vasil.dimov:3216)
View as plain text  
#At file:///usr/local/devel/bzrroot/server/mysql-5.5-bugteam/ based on revid:martin.hansson@stripped

 3216 Vasil Dimov	2010-10-07 [merge]
      Merge mysql-5.5-innodb -> mysql-5.5-bugteam

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb-zip.result
      mysql-test/suite/innodb/r/innodb_bug52745.result
      mysql-test/suite/innodb/r/innodb_bug53591.result
      mysql-test/suite/innodb/r/innodb_file_format.result
      mysql-test/suite/sys_vars/r/innodb_file_format_basic.result
      storage/innobase/handler/ha_innodb.cc
=== modified file 'mysql-test/suite/innodb/r/innodb-index.result'
--- a/mysql-test/suite/innodb/r/innodb-index.result	revid:martin.hansson@stripped
+++ b/mysql-test/suite/innodb/r/innodb-index.result	revid:vasil.dimov@stripped
@@ -918,9 +918,9 @@ ERROR HY000: Too big row
 alter table t1 row_format=compact;
 create index t1u on t1 (u(1));
 drop table t1;
-set global innodb_file_per_table=1;
-set global innodb_file_format=Barracuda;
-set global innodb_file_format_max=Barracuda;
+set global innodb_file_per_table=0;
+set global innodb_file_format=Antelope;
+set global innodb_file_format_max=Antelope;
 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
 CREATE TABLE t1(

=== modified file 'mysql-test/suite/innodb/r/innodb-zip.result'
--- a/mysql-test/suite/innodb/r/innodb-zip.result	revid:martin.hansson@stripped
+++ b/mysql-test/suite/innodb/r/innodb-zip.result	revid:vasil.dimov@stripped
@@ -394,8 +394,8 @@ table_schema	table_name	row_format
 test	t8	Compact
 test	t9	Redundant
 drop table t8, t9;
-set global innodb_file_per_table=1;
-set global innodb_file_format=Barracuda;
+set global innodb_file_per_table=0;
+set global innodb_file_format=Antelope;
 set global innodb_file_per_table=on;
 set global innodb_file_format=`Barracuda`;
 set global innodb_file_format_max=`Antelope`;

=== modified file 'mysql-test/suite/innodb/r/innodb_bug52745.result'
--- a/mysql-test/suite/innodb/r/innodb_bug52745.result	revid:martin.hansson@stripped
+++ b/mysql-test/suite/innodb/r/innodb_bug52745.result	revid:vasil.dimov@stripped
@@ -125,6 +125,6 @@ Warning	1264	Out of range value for colu
 Warning	1265	Data truncated for column 'col79' at row 1
 Warning	1264	Out of range value for column 'col84' at row 1
 DROP TABLE bug52745;
-SET GLOBAL innodb_file_format=Barracuda;
+SET GLOBAL innodb_file_format=Antelope;
 SET GLOBAL innodb_file_format_max=Antelope;
-SET GLOBAL innodb_file_per_table=1;
+SET GLOBAL innodb_file_per_table=0;

=== modified file 'mysql-test/suite/innodb/r/innodb_bug53591.result'
--- a/mysql-test/suite/innodb/r/innodb_bug53591.result	revid:martin.hansson@stripped
+++ b/mysql-test/suite/innodb/r/innodb_bug53591.result	revid:vasil.dimov@stripped
@@ -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=Barracuda;
+SET GLOBAL innodb_file_format=Antelope;
 SET GLOBAL innodb_file_format_max=Antelope;
-SET GLOBAL innodb_file_per_table=1;
+SET GLOBAL innodb_file_per_table=0;

=== modified file 'mysql-test/suite/innodb/r/innodb_file_format.result'
--- a/mysql-test/suite/innodb/r/innodb_file_format.result	revid:martin.hansson@stripped
+++ b/mysql-test/suite/innodb/r/innodb_file_format.result	revid:vasil.dimov@stripped
@@ -1,6 +1,6 @@
 select @@innodb_file_format;
 @@innodb_file_format
-Barracuda
+Antelope
 select @@innodb_file_format_check;
 @@innodb_file_format_check
 1
@@ -17,14 +17,14 @@ Barracuda
 set global innodb_file_format=default;
 select @@innodb_file_format;
 @@innodb_file_format
-Barracuda
+Antelope
 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
-Barracuda
+Antelope
 set global innodb_file_format_max=antelope;
 set global innodb_file_format_max=barracuda;
 set global innodb_file_format_max=cheetah;
@@ -46,5 +46,5 @@ Antelope
 set global innodb_file_format_max=antelope;
 set global innodb_file_format_check=off;
 ERROR HY000: Variable 'innodb_file_format_check' is a read only variable
-SET GLOBAL innodb_file_format=Barracuda;
+SET GLOBAL innodb_file_format=Antelope;
 SET GLOBAL innodb_file_format_max=Antelope;

=== 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	revid:martin.hansson@stripped
+++ b/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result	revid:vasil.dimov@stripped
@@ -1,28 +1,28 @@
 SET @start_global_value = @@global.innodb_file_format;
 SELECT @start_global_value;
 @start_global_value
-Barracuda
+Antelope
 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
-Barracuda
+Antelope
 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	Barracuda
+innodb_file_format	Antelope
 show session variables like 'innodb_file_format';
 Variable_name	Value
-innodb_file_format	Barracuda
+innodb_file_format	Antelope
 select * from information_schema.global_variables where variable_name='innodb_file_format';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_FILE_FORMAT	Barracuda
+INNODB_FILE_FORMAT	Antelope
 select * from information_schema.session_variables where variable_name='innodb_file_format';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_FILE_FORMAT	Barracuda
+INNODB_FILE_FORMAT	Antelope
 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
-Barracuda
+Antelope

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:martin.hansson@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:vasil.dimov@stripped
@@ -10841,13 +10841,13 @@ static MYSQL_SYSVAR_ULONG(fast_shutdown,
 static MYSQL_SYSVAR_BOOL(file_per_table, srv_file_per_table,
   PLUGIN_VAR_NOCMDARG,
   "Stores each InnoDB table to an .ibd file in the database dir.",
-  NULL, NULL, TRUE);
+  NULL, NULL, FALSE);
 
 static MYSQL_SYSVAR_STR(file_format, innobase_file_format_name,
   PLUGIN_VAR_RQCMDARG,
   "File format to use for new tables in .ibd files.",
   innodb_file_format_name_validate,
-  innodb_file_format_name_update, "Barracuda");
+  innodb_file_format_name_update, "Antelope");
 
 /* "innobase_file_format_check" decides whether we would continue
 booting the server if the file format stamped on the system


Attachment: [text/bzr-bundle] bzr/vasil.dimov@oracle.com-20101007114347-jz1t41f4ev381rhk.bundle
Thread
bzr commit into mysql-5.5-bugteam branch (vasil.dimov:3216) vasil.dimov7 Oct