bzr push into mysql-trunk branch (akhila.x.maddukuri:5208 to 5209)

[Akhila Maddukuri]

 5209 Akhila Maddukuri	2012-12-11
      removed an out-of-bound test-case

    modified:
      mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result
      mysql-test/suite/sys_vars/t/query_prealloc_size_basic.test
 5208 Bernt M. Johnsen	2012-12-11
      WL#6587 Two tests were not working to windows

    modified:
      mysql-test/t/disconnect_on_expired_password_default.test
      mysql-test/t/disconnect_on_expired_password_off.test
=== modified file 'mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result	2012-10-09 16:10:11 +0000
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result	2012-12-11 12:10:44 +0000
@@ -65,42 +65,36 @@ Warning	1292	Truncated incorrect query_p
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
 8192
-SET @@global.query_prealloc_size   = 429496729533;
-Warnings:
-Warning	1292	Truncated incorrect query_prealloc_size value: '429496729533'
-SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
-@@global.query_prealloc_size IN (429496728576,4294966272)
-1
 SET @@global.query_prealloc_size   = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
 @@global.query_prealloc_size IN (429496728576,4294966272)
-1
+0
 SET @@global.query_prealloc_size   = test;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size  IN (429496728576,4294966272);
 @@global.query_prealloc_size  IN (429496728576,4294966272)
-1
+0
 SET @@global.query_prealloc_size   = "test";
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
 @@global.query_prealloc_size IN (429496728576,4294966272)
-1
+0
 SET @@global.query_prealloc_size   = 'test';
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
 @@global.query_prealloc_size IN (429496728576,4294966272)
-1
+0
 SET @@global.query_prealloc_size   = ' ';
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
 @@global.query_prealloc_size IN (429496728576,4294966272)
-1
+0
 SET @@global.query_prealloc_size   = ON;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
 @@global.query_prealloc_size IN (429496728576,4294966272)
-1
+0
 SET @@session.query_prealloc_size   = 0;
 Warnings:
 Warning	1292	Truncated incorrect query_prealloc_size value: '0'
@@ -118,27 +112,21 @@ ERROR 42000: Incorrect argument type to
 SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
 @@session.query_prealloc_size IN (429496728576,4294966272)
 0
-SET @@session.query_prealloc_size   = 429496729533;
-Warnings:
-Warning	1292	Truncated incorrect query_prealloc_size value: '429496729533'
-SELECT @@global.query_prealloc_size IN (429496728576,4294966272);
-@@global.query_prealloc_size IN (429496728576,4294966272)
-1
 SET @@session.query_prealloc_size   = test;
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
 @@session.query_prealloc_size IN (429496728576,4294966272)
-1
+0
 SET @@session.query_prealloc_size   = "test";
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
 @@session.query_prealloc_size IN (429496728576,4294966272)
-1
+0
 SET @@session.query_prealloc_size   = " ";
 ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
 SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
 @@session.query_prealloc_size IN (429496728576,4294966272)
-1
+0
 '#------------------FN_DYNVARS_005_06-----------------------#'
 SELECT @@global.query_prealloc_size   = VARIABLE_VALUE
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -170,7 +158,7 @@ Warnings:
 Warning	1292	Truncated incorrect query_prealloc_size value: '10'
 SELECT @@query_prealloc_size   = @@global.query_prealloc_size  ;
 @@query_prealloc_size   = @@global.query_prealloc_size
-0
+1
 '#---------------------FN_DYNVARS_001_10----------------------#'
 SET @@query_prealloc_size   = 100;
 Warnings:

=== modified file 'mysql-test/suite/sys_vars/t/query_prealloc_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/query_prealloc_size_basic.test	2012-10-09 16:10:11 +0000
+++ b/mysql-test/suite/sys_vars/t/query_prealloc_size_basic.test	2012-12-11 12:10:44 +0000
@@ -108,8 +108,8 @@ SELECT @@global.query_prealloc_size  ;
 
 SET @@global.query_prealloc_size   = -1024;
 SELECT @@global.query_prealloc_size  ;
-SET @@global.query_prealloc_size   = 429496729533;
-SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
+#SET @@global.query_prealloc_size   = 429496729533;
+#SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
 
 
 --Error ER_WRONG_TYPE_FOR_VAR
@@ -146,8 +146,8 @@ SELECT @@session.query_prealloc_size  ;
 --Error  ER_WRONG_TYPE_FOR_VAR
 SET @@session.query_prealloc_size   = 65530.34;
 SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
-SET @@session.query_prealloc_size   = 429496729533;
-SELECT @@global.query_prealloc_size IN (429496728576,4294966272);
+#SET @@session.query_prealloc_size   = 429496729533;
+#SELECT @@global.query_prealloc_size IN (429496728576,4294966272);
 
 
 --Error ER_WRONG_TYPE_FOR_VAR

No bundle (reason: useless for push emails).