List:Commits« Previous MessageNext Message »
From:marko.makela Date:October 21 2010 8:33am
Subject:bzr commit into mysql-trunk-innodb branch (marko.makela:3271)
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:marko.makela@strippedg5z7a1o0q90j

 3271 Marko Mäkelä	2010-10-21 [merge]
      Merge from mysql-5.5-innodb to mysql-trunk-innodb

    modified:
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/suite/sys_vars/t/all_vars.test
=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	revid:marko.makela@stripped
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	revid:marko.makela@stripped
@@ -3,6 +3,7 @@ create table t2 (variable_name text);
 load data infile "MYSQLTEST_VARDIR/tmp/sys_vars.all_vars.txt" into table t1;
 insert into t2 select variable_name from information_schema.global_variables;
 insert into t2 select variable_name from information_schema.session_variables;
+delete from t2 where variable_name='innodb_change_buffering_debug';
 update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");
 select variable_name as `There should be *no* long test name listed below:` from t2
 where length(variable_name) > 50;

=== modified file 'mysql-test/suite/sys_vars/t/all_vars.test'
--- a/mysql-test/suite/sys_vars/t/all_vars.test	revid:marko.makela@stripped
+++ b/mysql-test/suite/sys_vars/t/all_vars.test	revid:marko.makela@stripped
@@ -61,6 +61,9 @@ eval load data infile "$MYSQLTEST_VARDIR
 insert into t2 select variable_name from information_schema.global_variables;
 insert into t2 select variable_name from information_schema.session_variables;
 
+# This is only present in debug builds.
+delete from t2 where variable_name='innodb_change_buffering_debug';
+
 # Performance schema variables are too long for files named
 # 'mysql-test/suite/sys_vars/t/' ...
 # ... 'performance_schema_events_waits_history_long_size_basic-master.opt'

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20101021083303-7s368m8e6potnrzi.bundle
Thread
bzr commit into mysql-trunk-innodb branch (marko.makela:3271) marko.makela21 Oct