bzr push into mysql-trunk branch (rohit.kalhans:3467 to 3468)

[Rohit Kalhans]

 3468 Rohit Kalhans	2011-10-03 [merge]
      Upmerge from mysql-5.5 to mysql-trunk 

    modified:
      mysql-test/include/commit.inc
      mysql-test/r/commit_1innodb.result
 3467 Vasil Dimov	2011-10-03
      Enforce a 512GiB limit on the combined log size. Higher values have not
      been tested and code review shows that the block number is clipped to 1G
      in log_block_convert_lsn_to_no(). With 512 bytes blocks we have a limit
      of 512GiB.

    modified:
      storage/innobase/srv/srv0start.c
=== modified file 'mysql-test/include/commit.inc'
--- a/mysql-test/include/commit.inc	2011-09-30 12:33:40 +0000
+++ b/mysql-test/include/commit.inc	2011-10-03 10:45:54 +0000
@@ -524,9 +524,31 @@ call p_verify_status_increment(2, 2, 2,
 --disable_warnings
 update ignore t1 set a=2 where a=1;
 --enable_warnings
-call p_verify_status_increment(2, 2, 1, 0);
+if (`select @@binlog_format = 'STATEMENT'`)
+{
+  --disable_query_log
+  call p_verify_status_increment(2, 2, 1, 0);
+  --enable_query_log
+}
+if (`select @@binlog_format != 'STATEMENT'`)
+{
+  --disable_query_log
+  call p_verify_status_increment(1, 0, 1, 0);
+  --enable_query_log
+}
 commit;
-call p_verify_status_increment(2, 2, 1, 0);
+if (`select @@binlog_format = 'STATEMENT'`)
+{
+  --disable_query_log
+  call p_verify_status_increment(2, 2, 1, 0);
+  --enable_query_log
+}
+if (`select @@binlog_format != 'STATEMENT'`)
+{
+  --disable_query_log
+  call p_verify_status_increment(1, 0, 1, 0);
+  --enable_query_log
+}
 --echo #
 --echo # Create a stored function that modifies a
 --echo # non-transactional table. Demonstrate that changes in

=== modified file 'mysql-test/r/commit_1innodb.result'
--- a/mysql-test/r/commit_1innodb.result	2011-09-30 12:33:40 +0000
+++ b/mysql-test/r/commit_1innodb.result	2011-10-03 10:45:54 +0000
@@ -549,11 +549,9 @@ SUCCESS
 # 15. Read-write statement: UPDATE IGNORE, change 0 rows. 
 #
 update ignore t1 set a=2 where a=1;
-call p_verify_status_increment(2, 2, 1, 0);
 SUCCESS
 
 commit;
-call p_verify_status_increment(2, 2, 1, 0);
 SUCCESS
 
 #

No bundle (reason: useless for push emails).