bzr push into mysql-5.5-innodb branch (marko.makela:3195 to 3196) Bug#56680

[marko.makela]

 3196 Marko Mäkelä	2010-10-21
      Fix a sys_vars.all_vars failure caused by Bug #56680 instrumentation.
      
      The variable innodb_change_buffering_debug is only present in debug builds.
      Hide it from the test, so that the test passes in both debug and non-debug.

    modified:
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/suite/sys_vars/t/all_vars.test
 3195 Marko Mäkelä	2010-10-21
      Remove files that are no longer needed.
      
      These files were needed when InnoDB Plugin was maintained and distributed
      separately from the MySQL 5.1 source tree. They have never been needed in
      MySQL 5.5.
      
      storage/innobase/mysql-test:
       Patches to the test suite.
      
      storage/innobase/handler/mysql_addons.cc:
       Wrappers for private MySQL functions.

    removed:
      storage/innobase/handler/mysql_addons.cc
      storage/innobase/include/mysql_addons.h
      storage/innobase/mysql-test/
      storage/innobase/mysql-test/patches/
      storage/innobase/mysql-test/patches/README
      storage/innobase/mysql-test/patches/index_merge_innodb-explain.diff
      storage/innobase/mysql-test/patches/information_schema.diff
      storage/innobase/mysql-test/patches/innodb_change_buffering_basic.diff
      storage/innobase/mysql-test/patches/innodb_file_per_table.diff
      storage/innobase/mysql-test/patches/innodb_lock_wait_timeout.diff
      storage/innobase/mysql-test/patches/innodb_thread_concurrency_basic.diff
      storage/innobase/mysql-test/patches/partition_innodb.diff
    modified:
      storage/innobase/CMakeLists.txt
      storage/innobase/Makefile.am
      storage/innobase/trx/trx0i_s.c
=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	revid:[e-mail]-20101021074544-qpi45e7rtxst32m4
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	revid:[e-mail]-20101021083043-3634qa1cfeeyit1h
@@ -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:[e-mail]-20101021074544-qpi45e7rtxst32m4
+++ b/mysql-test/suite/sys_vars/t/all_vars.test	revid:marko.makela@stripped20101021083043-3634qa1cfeeyit1h
@@ -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/[e-mail]