From 2faa75ed26bbd0644775907e9a959a17ad4e4ff6 Mon Sep 17 00:00:00 2001
From: Satya B <satya.bn@sun.com>
Date: Mon, 30 Nov 2009 14:38:41 +0530
Subject: Applying InnoDB snapshot 5.1-ss6242, part 6. Fixes BUG#48482

1. BUG#48482 - innodb-autoinc.test fails with results difference

2. enable the disabled test

Detailed revision comments:

r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
---
 mysql-test/t/disabled.def | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mysql-test/t/disabled.def')

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index ad7617b9403..ac89c1493cd 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -13,5 +13,4 @@ kill                     : Bug#37780 2008-12-03 HHunger need some changes to be
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
 partition_innodb_plugin  : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
-innodb-autoinc           : Bug#48482 2009-11-02 svoj innodb-autoinc.test fails with results difference
 rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2
-- 
cgit v1.2.1


From cefd968dddcbd333fad186daeebeb17ef907d154 Mon Sep 17 00:00:00 2001
From: Satya B <satya.bn@sun.com>
Date: Mon, 30 Nov 2009 16:24:20 +0530
Subject: Applying Innodb Snapshot 5.1-ss6242, part 9.

1. Enabling the disabled test for BUG#32430 for builtin innodb
2. Disabling the innodb-autoinc.test for innodb plugin.
---
 mysql-test/t/disabled.def | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mysql-test/t/disabled.def')

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index ac89c1493cd..c136a2d5162 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -11,6 +11,5 @@
 ##############################################################################
 kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
-partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
 partition_innodb_plugin  : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
 rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2
-- 
cgit v1.2.1


From 54e01f3ce12e33db9a77e4ff98d5ee33550af57d Mon Sep 17 00:00:00 2001
From: Satya B <satya.bn@sun.com>
Date: Mon, 30 Nov 2009 17:12:51 +0530
Subject: Applying InnoDB Plugin 1.0.6 snapshot, part 2. Fixes BUG#32430

Enable partition_innodb_plugin.test for BUG#32430
applied revisions: r6134, r6137, r6153

Detailed revision comments:

r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.

rb://134 approved by Sunny Bains
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
branches/zip: Merge r6125:6152 from branches/5.1:

(everything except the last white-space change was skipped as it is already
in branches/zip)

  ------------------------------------------------------------------------
  r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
  Changed paths:
     M /branches/5.1/Makefile.am
     M /branches/5.1/mysql-test/innodb-autoinc.result
     M /branches/5.1/mysql-test/innodb-autoinc.test

  branches/5.1:

  Backport c6121 from branches/zip:

    ------------------------------------------------------------------------
    r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
    Changed paths:
       M /branches/zip/mysql-test/innodb-autoinc.result

    branches/zip: This test has been problematic for sometime now. The underlying
    bug is that the data dictionaries get out of sync. In the AUTOINC code we
    try and apply salve to the symptoms. In the past MySQL made some unrelated
    change and the dictionaries stopped getting out of sync and this test started
    to fail. Now, it seems they have reverted that changed and the test is
    passing again. I suspect this is not he last time that this test will change.

    ------------------------------------------------------------------------

  ------------------------------------------------------------------------
  r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
  Changed paths:
     M /branches/5.1/Makefile.am

  branches/5.1:

  Revert a change to Makefile.am that sneaked unnoticed in c6127.

  ------------------------------------------------------------------------
  r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
  Changed paths:
     M /branches/5.1/handler/ha_innodb.cc
     M /branches/5.1/include/ha_prototypes.h
     M /branches/5.1/ut/ut0ut.c

  branches/5.1: Port r6134 from branches/zip:

    ------------------------------------------------------------------------
    r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines

    branches/zip: innobase_convert_identifier(): Convert table names with
    explain_filename() to address Bug #32430: 'show innodb status'
    causes errors Invalid (old?) table or database name in logs.

    rb://134 approved by Sunny Bains
    ------------------------------------------------------------------------

  innobase_print_identifier(): Replace with innobase_convert_name().

  innobase_convert_identifier(): New function, called by innobase_convert_name().
  ------------------------------------------------------------------------
  r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
  Changed paths:
     M /branches/5.1/CMakeLists.txt

  branches/5.1:

  Followup to r5700: Adjust the changes so they are the same as in the BZR
  repository.

  ------------------------------------------------------------------------
  r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
  Changed paths:
     M /branches/5.1/handler/ha_innodb.cc

  branches/5.1:

  Merge a part of r2911.5.5 from MySQL:
  (the other part of this was merged in c5700)

    ------------------------------------------------------------
    revno: 2911.5.5
    committer: Vladislav Vaintroub <vvaintroub@mysql.com>
    branch nick: 5.1-innodb_plugin
    timestamp: Wed 2009-06-10 10:59:49 +0200
    message:
      Backport WL#3653 to 5.1 to enable bundled innodb plugin.
      Remove custom DLL loader code from innodb plugin code, use
      symbols exported from mysqld.
    removed:
      storage/innodb_plugin/handler/handler0vars.h
      storage/innodb_plugin/handler/win_delay_loader.cc
    added:
      storage/mysql_storage_engine.cmake
      win/create_def_file.js
    modified:
      CMakeLists.txt
      include/m_ctype.h
      include/my_global.h
      include/my_sys.h
      include/mysql/plugin.h
      libmysqld/CMakeLists.txt
      mysql-test/mysql-test-run.pl
      mysql-test/t/plugin.test
      mysql-test/t/plugin_load-master.opt
      mysys/charset.c
      sql/CMakeLists.txt
      sql/handler.h
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_list.h
      sql/sql_profile.h
      storage/Makefile.am
      storage/archive/CMakeLists.txt
      storage/blackhole/CMakeLists.txt
      storage/csv/CMakeLists.txt
      storage/example/CMakeLists.txt
      storage/federated/CMakeLists.txt
      storage/heap/CMakeLists.txt
      storage/innobase/CMakeLists.txt
      storage/innobase/handler/ha_innodb.cc
      storage/innodb_plugin/CMakeLists.txt
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/handler/handler0alter.cc
      storage/innodb_plugin/handler/i_s.cc
      storage/innodb_plugin/plug.in
      storage/myisam/CMakeLists.txt
      storage/myisammrg/CMakeLists.txt
      win/Makefile.am
      win/configure.js

  ------------------------------------------------------------------------
  r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
  Changed paths:
     M /branches/5.1/handler/ha_innodb.cc

  branches/5.1:

  White space fixup.

  ------------------------------------------------------------------------
---
 mysql-test/t/disabled.def | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mysql-test/t/disabled.def')

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index c136a2d5162..06d3dbb4e57 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -11,5 +11,4 @@
 ##############################################################################
 kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
-partition_innodb_plugin  : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
 rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2
-- 
cgit v1.2.1


From d24b879474e16e99b738d831ec9a3f2a4a341fd6 Mon Sep 17 00:00:00 2001
From: Satya B <satya.bn@sun.com>
Date: Wed, 2 Dec 2009 15:17:49 +0530
Subject: Disable the test case innodb-autonic.test until BUG#49267 is fixed

Add the test to disabled list and remove from the experimental list.
---
 mysql-test/t/disabled.def | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mysql-test/t/disabled.def')

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 06d3dbb4e57..378b810fcbb 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -12,3 +12,4 @@
 kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2
+innodb-autoinc           : Bug#49267 2009-12-02 test fails on windows because of different case mode
-- 
cgit v1.2.1

