bzr push into mysql-trunk branch (akhila.x.maddukuri:4705 to 4706)

[Akhila Maddukuri]

 4706 Akhila Maddukuri	2012-10-11
      It is a re-commit

    modified:
      mysql-test/suite/sys_vars/r/key_buffer_size_basic.result
      mysql-test/suite/sys_vars/t/key_buffer_size_basic.test
 4705 Vasil Dimov	2012-10-10 [merge]
      Merge mysql-5.6 -> mysql-trunk

=== modified file 'mysql-test/suite/sys_vars/r/key_buffer_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result	2012-10-09 16:10:11 +0000
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result	2012-10-11 06:46:31 +0000
@@ -32,37 +32,31 @@ ERROR HY000: Cannot drop default keycach
 SELECT @@global.key_buffer_size;
 @@global.key_buffer_size
 61440
-SET @@global.key_buffer_size = 429380394747;
-Warnings:
-Warning	1292	Truncated incorrect key_buffer_size value: '429380394747'
-SELECT @@global.key_buffer_size IN (429380390912,4294963200);
-@@global.key_buffer_size IN (429380390912,4294963200)
-1
 SET @@global.key_buffer_size = 10000.01;
 ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
 SELECT @@global.key_buffer_size IN (429380390912,4294963200);
 @@global.key_buffer_size IN (429380390912,4294963200)
-1
+0
 SET @@global.key_buffer_size = ' ';
 ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
 SELECT @@global.key_buffer_size IN (429380390912,4294963200);
 @@global.key_buffer_size IN (429380390912,4294963200)
-1
+0
 SET @@global.key_buffer_size = " ";
 ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
 SELECT @@global.key_buffer_size IN (429380390912,4294963200);
 @@global.key_buffer_size IN (429380390912,4294963200)
-1
+0
 SET @@global.key_buffer_size = ON;
 ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
 SELECT @@global.key_buffer_size IN (429380390912,4294963200);
 @@global.key_buffer_size IN (429380390912,4294963200)
-1
+0
 SET @@global.key_buffer_size = 'test';
 ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
 SELECT @@global.key_buffer_size IN (429380390912,4294963200);
 @@global.key_buffer_size IN (429380390912,4294963200)
-1
+0
 '#-------------------FN_DYNVARS_055_05----------------------------#'
 SET @@session.key_buffer_size = 0;
 ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL

=== modified file 'mysql-test/suite/sys_vars/t/key_buffer_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test	2012-10-09 16:10:11 +0000
+++ b/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test	2012-10-11 06:46:31 +0000
@@ -77,9 +77,6 @@ SELECT @@global.key_buffer_size;
 --Error ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
 SET @@global.key_buffer_size = -1024;
 SELECT @@global.key_buffer_size;
-SET @@global.key_buffer_size = 429380394747;
-SELECT @@global.key_buffer_size IN (429380390912,4294963200);
-
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.key_buffer_size = 10000.01;

No bundle (reason: useless for push emails).