bzr push into mysql-trunk branch (alexander.barkov:3365 to 3366) WL#946

[Alexander Barkov]

 3366 Alexander Barkov	2011-05-19
      WL#946 Fixing test results

    modified:
      mysql-test/suite/sys_vars/r/timestamp_basic.result
 3365 Alexander Barkov	2011-05-18
      WL#946: fixing some test failures.
      As the datatype of @@timestamp has changed
      from Sys_var_session_special (ulonglong based)
      to Sys_var_session_special_double (double bases),
      it's not any more correct to use "~(time_t)0" as the upper
      limit parameter to constructor.

    modified:
      sql/sys_vars.cc
=== modified file 'mysql-test/suite/sys_vars/r/timestamp_basic.result'
--- a/mysql-test/suite/sys_vars/r/timestamp_basic.result	2011-05-18 17:21:03 +0000
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic.result	2011-05-19 05:34:45 +0000
@@ -29,7 +29,7 @@ ERROR 42000: Incorrect argument type to 
 SET @@timestamp = " ";
 ERROR 42000: Incorrect argument type to variable 'timestamp'
 SET @@timestamp = 9999999999999999999999;
-ERROR 42000: Variable 'timestamp' can't be set to the value of '1e+22'
+ERROR 42000: Variable 'timestamp' can't be set to the value of '2.14748e+09'
 '#----------------------FN_DYNVARS_001_06------------------------#'
 '#---------------------FN_DYNVARS_001_08-------------------------#'
 SET @@timestamp = OFF;

No bundle (reason: useless for push emails).