bzr push into mysql-trunk branch (akhila.x.maddukuri:4692 to 4693)

[Akhila Maddukuri]

 4693 Akhila Maddukuri	2012-10-10
      This is re-commit

    modified:
      mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result
      mysql-test/suite/sys_vars/r/innodb_io_capacity_max_basic.result
      mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test
      mysql-test/suite/sys_vars/t/innodb_io_capacity_max_basic.test
 4692 Nirbhay Choubey	2012-10-09
      Bug#14554568: Post-fix

    modified:
      client/mysql.cc
      include/my_sys.h
      mysys/my_conio.c
=== modified file 'mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result'
--- a/mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result	2012-10-09 16:10:11 +0000
+++ b/mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result	2012-10-10 03:20:00 +0000
@@ -41,9 +41,9 @@ set session innodb_io_capacity=233;
 ERROR HY000: Variable 'innodb_io_capacity' is a GLOBAL variable and should be set with SET GLOBAL
 set @@global.innodb_io_capacity=100;
 set @@global.innodb_io_capacity=DEFAULT;
-select @@global.innodb_io_capacity IN (18446744073709551615,4294967295);
-@@global.innodb_io_capacity IN (18446744073709551615,4294967295)
-0
+select @@global.innodb_io_capacity;
+@@global.innodb_io_capacity
+200
 set global innodb_io_capacity=1.1;
 ERROR 42000: Incorrect argument type to variable 'innodb_io_capacity'
 set global innodb_io_capacity=1e1;

=== modified file 'mysql-test/suite/sys_vars/r/innodb_io_capacity_max_basic.result'
--- a/mysql-test/suite/sys_vars/r/innodb_io_capacity_max_basic.result	2012-09-04 06:05:06 +0000
+++ b/mysql-test/suite/sys_vars/r/innodb_io_capacity_max_basic.result	2012-10-10 03:20:00 +0000
@@ -48,9 +48,9 @@ ERROR 42000: Incorrect argument type to
 set global innodb_io_capacity_max=" ";
 ERROR 42000: Incorrect argument type to variable 'innodb_io_capacity_max'
 SET @@global.innodb_io_capacity_max = DEFAULT;
-select @@global.innodb_io_capacity_max;
-@@global.innodb_io_capacity_max
-18446744073709551615
+select @@global.innodb_io_capacity_max IN (18446744073709551615,4294967295);
+@@global.innodb_io_capacity_max IN (18446744073709551615,4294967295)
+1
 set global innodb_io_capacity_max=@start_innodb_capacity - 1;
 Warnings:
 Warning	1210	innodb_io_capacity_max cannot be set lower than innodb_io_capacity.

=== modified file 'mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test'
--- a/mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test	2012-10-09 16:10:11 +0000
+++ b/mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test	2012-10-10 03:20:00 +0000
@@ -40,7 +40,7 @@ set session innodb_io_capacity=233;
 
 set @@global.innodb_io_capacity=100;
 set @@global.innodb_io_capacity=DEFAULT;
-select @@global.innodb_io_capacity IN (18446744073709551615,4294967295);
+select @@global.innodb_io_capacity;
 
 #
 # incorrect types

=== modified file 'mysql-test/suite/sys_vars/t/innodb_io_capacity_max_basic.test'
--- a/mysql-test/suite/sys_vars/t/innodb_io_capacity_max_basic.test	2012-09-04 06:05:06 +0000
+++ b/mysql-test/suite/sys_vars/t/innodb_io_capacity_max_basic.test	2012-10-10 03:20:00 +0000
@@ -51,7 +51,7 @@ set global innodb_io_capacity_max=" ";
 #
 
 SET @@global.innodb_io_capacity_max = DEFAULT;
-select @@global.innodb_io_capacity_max;
+select @@global.innodb_io_capacity_max IN (18446744073709551615,4294967295);
 
 #
 # can't set it below innodb_io_capacity

No bundle (reason: useless for push emails).