From 3adae7f2cf84f3b62d1beab82cc95a6666b2f67c Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Wed, 12 Aug 2009 17:46:12 +0500 Subject: [PATCH 1/4] Disable main.index_merge_innodb with InnoDB plugin. The test case is not ready to run with innoplug-1.0.4. --- mysql-test/lib/mtr_cases.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index c9c0f1796e5..873339166b3 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -494,6 +494,7 @@ sub collect_one_suite($) next if ($test->{'skip'} || !$test->{'innodb_test'}); # Exceptions next if ($test->{'name'} eq 'main.innodb'); # Failed with wrong errno (fk) + next if ($test->{'name'} eq 'main.index_merge_innodb'); # Explain diff # innodb_file_per_table is rw with innodb_plugin next if ($test->{'name'} eq 'sys_vars.innodb_file_per_table_basic'); # innodb_lock_wait_timeout is rw with innodb_plugin From 606c7e0d12e5ae597856483a0e4313793dff4548 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 12 Aug 2009 16:41:07 +0200 Subject: [PATCH 2/4] Raise version number after cloning 5.1.38 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index b3a5abdc38d..5b9f3e0f200 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM # # When changing major version number please also check switch statement # in mysqlbinlog::check_master_version(). -AM_INIT_AUTOMAKE(mysql, 5.1.38) +AM_INIT_AUTOMAKE(mysql, 5.1.39) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 From b05eeab59361afc0c7d6c92928c8bab2e996ca7d Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Wed, 12 Aug 2009 23:43:20 +0400 Subject: [PATCH 3/4] Fix 5.1 build error. --- storage/innodb_plugin/include/btr0cur.h | 2 +- storage/innodb_plugin/include/trx0types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innodb_plugin/include/btr0cur.h b/storage/innodb_plugin/include/btr0cur.h index b2d43ae3254..480a3877e54 100644 --- a/storage/innodb_plugin/include/btr0cur.h +++ b/storage/innodb_plugin/include/btr0cur.h @@ -618,7 +618,7 @@ enum btr_cur_method { hash_node, and might be necessary to update */ BTR_CUR_BINARY, /*!< success using the binary search */ - BTR_CUR_INSERT_TO_IBUF, /*!< performed the intended insert to + BTR_CUR_INSERT_TO_IBUF /*!< performed the intended insert to the insert buffer */ }; diff --git a/storage/innodb_plugin/include/trx0types.h b/storage/innodb_plugin/include/trx0types.h index 08cc9622d02..24cf57d53d5 100644 --- a/storage/innodb_plugin/include/trx0types.h +++ b/storage/innodb_plugin/include/trx0types.h @@ -70,7 +70,7 @@ typedef struct trx_named_savept_struct trx_named_savept_t; enum trx_rb_ctx { RB_NONE = 0, /*!< no rollback */ RB_NORMAL, /*!< normal rollback */ - RB_RECOVERY, /*!< rolling back an incomplete transaction, + RB_RECOVERY /*!< rolling back an incomplete transaction, in crash recovery */ }; From 09d042249ad7e29c05d198729cdc24d0a1dd03ae Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Wed, 12 Aug 2009 23:45:01 +0400 Subject: [PATCH 4/4] Ignore auto-generated file: libmysqld/examples/mysqltest.cc --- .bzrignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.bzrignore b/.bzrignore index fad758b54b8..6c6a43dacab 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3063,3 +3063,4 @@ sql/share/slovak sql/share/spanish sql/share/swedish sql/share/ukrainian +libmysqld/examples/mysqltest.cc