bzr commit into mysql-trunk-innodb branch (vasil.dimov:3038)

[vasil.dimov]

#At file:///usr/local/devel/bzr-svn/branched/mysql-trunk-innodb/ based on revid:vasil.dimov@stripped

 3038 Vasil Dimov	2010-04-22 [merge]
      Merge from innodb-branches-innodb+

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/univ.i
      storage/innobase/trx/trx0trx.c
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	2010-04-19 17:53:16 +0000
+++ b/storage/innobase/handler/ha_innodb.cc	2010-04-22 10:51:12 +0000
@@ -2282,7 +2282,7 @@ mem_free_and_error:
 		}
 
 		sql_print_error("InnoDB: invalid value "
-				"innodb_file_format_check=%s",
+				"innodb_change_buffering=%s",
 				innobase_change_buffering);
 		goto mem_free_and_error;
 	}

=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	2010-04-21 09:53:37 +0000
+++ b/storage/innobase/include/univ.i	2010-04-22 10:51:12 +0000
@@ -115,7 +115,7 @@ if we are compiling on Windows. */
 
 /* Include <sys/stat.h> to get S_I... macros defined for os0file.c */
 # include <sys/stat.h>
-# if !defined(__NETWARE__) && !defined(__WIN__) 
+# if !defined(__NETWARE__) && !defined(__WIN__)
 #  include <sys/mman.h> /* mmap() for os0proc.c */
 # endif
 

=== modified file 'storage/innobase/trx/trx0trx.c'
--- a/storage/innobase/trx/trx0trx.c	2010-04-19 15:44:15 +0000
+++ b/storage/innobase/trx/trx0trx.c	2010-04-22 09:48:57 +0000
@@ -847,7 +847,7 @@ trx_commit_off_kernel(
 	recovery i.e.: back ground rollback thread is still active
 	then there is a chance that the rollback thread may see
 	this trx as COMMITTED_IN_MEMORY and goes adhead to clean it
-	up calling trx_cleanup_at_db_startup(). This can happen 
+	up calling trx_cleanup_at_db_startup(). This can happen
 	in the case we are committing a trx here that is left in
 	PREPARED state during the crash. Note that commit of the
 	rollback of a PREPARED trx happens in the recovery thread


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