bzr commit into mysql-5.1 branch (joerg:2967)

[Joerg Bruehe]

#At file:///MySQL/REPO/V51/push-5.1/ based on revid:df@stripped

 2967 Joerg Bruehe	2009-08-13 [merge]
      Merge main 5.1 into 5.1-build

    modified:
      .bzrignore
      configure.in
      mysql-test/lib/mtr_cases.pm
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/trx0types.h
=== modified file '.bzrignore'
--- a/.bzrignore	2009-02-27 11:20:53 +0000
+++ b/.bzrignore	2009-08-12 19:45:01 +0000
@@ -3063,3 +3063,4 @@ sql/share/slovak
 sql/share/spanish
 sql/share/swedish
 sql/share/ukrainian
+libmysqld/examples/mysqltest.cc

=== modified file 'configure.in'
--- a/configure.in	2009-07-13 20:43:31 +0000
+++ b/configure.in	2009-08-12 14:41:07 +0000
@@ -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

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-07-30 12:42:56 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2009-08-12 12:46:12 +0000
@@ -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

=== modified file 'storage/innodb_plugin/include/btr0cur.h'
--- a/storage/innodb_plugin/include/btr0cur.h	2009-05-27 09:45:59 +0000
+++ b/storage/innodb_plugin/include/btr0cur.h	2009-08-12 19:43:20 +0000
@@ -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 */
 };
 

=== modified file 'storage/innodb_plugin/include/trx0types.h'
--- a/storage/innodb_plugin/include/trx0types.h	2009-07-30 12:42:56 +0000
+++ b/storage/innodb_plugin/include/trx0types.h	2009-08-12 19:43:20 +0000
@@ -70,7 +70,7 @@ typedef struct trx_named_savept_struct 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 */
 };
 


Attachment: [text/bzr-bundle] bzr/[e-mail]