bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3130 to 3131)

[Tor Didriksen]

 3131 Tor Didriksen	2010-05-05
      Make these files identical to next-mr-bf tree

    modified:
      mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
      mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
 3130 Tor Didriksen	2010-05-05 [merge]
      Fix assorted compiler warnings.

    modified:
      sql/handler.cc
      sql/sql_base.cc
      sql/sql_update.cc
      sql/sys_vars.cc
=== modified file 'mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc	2010-05-02 18:01:00 +0000
+++ b/mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc	2010-05-05 12:36:57 +0000
@@ -91,10 +91,10 @@ SET @@session.query_alloc_block_size = 1
 SELECT @@session.query_alloc_block_size;
 SET @@session.query_alloc_block_size = 1025;
 SELECT @@session.query_alloc_block_size;
-#SET @@session.query_alloc_block_size = 4294967295;
-#SELECT @@session.query_alloc_block_size;
-#SET @@session.query_alloc_block_size = 4294967294;
-#SELECT @@session.query_alloc_block_size;
+SET @@session.query_alloc_block_size = 4294967295;
+SELECT @@session.query_alloc_block_size;
+SET @@session.query_alloc_block_size = 4294967294;
+SELECT @@session.query_alloc_block_size;
 SET @@session.query_alloc_block_size = 655536;
 SELECT @@session.query_alloc_block_size;
 

=== modified file 'mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result	2010-05-02 18:01:00 +0000
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result	2010-05-05 12:36:57 +0000
@@ -68,6 +68,18 @@ Warning	1292	Truncated incorrect query_a
 SELECT @@session.query_alloc_block_size;
 @@session.query_alloc_block_size
 1024
+SET @@session.query_alloc_block_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect query_alloc_block_size value: '4294967295'
+SELECT @@session.query_alloc_block_size;
+@@session.query_alloc_block_size
[phone]
+SET @@session.query_alloc_block_size = 4294967294;
+Warnings:
+Warning	1292	Truncated incorrect query_alloc_block_size value: '4294967294'
+SELECT @@session.query_alloc_block_size;
+@@session.query_alloc_block_size
[phone]
 SET @@session.query_alloc_block_size = 655536;
 Warnings:
 Warning	1292	Truncated incorrect query_alloc_block_size value: '655536'


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