bzr commit into mysql-trunk-bugfixing branch (Georgi.Kodinov:3051) Bug#52315

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/fix-trunk-merge/ based on revid:sergey.glukhov@stripped

 3051 Georgi Kodinov	2010-06-08
      Addendum to merge of Bug#52315 to mysql-trunk-merge : 
      Fixed the failing sys_vars.timestamp_basic.test by 
      not re-calculating the value of the system variable at
      check time.

    modified:
      sql/sys_vars.cc
=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-06-07 10:37:11 +0000
+++ b/sql/sys_vars.cc	2010-06-08 10:17:46 +0000
@@ -2388,7 +2388,6 @@ static bool check_timestamp(sys_var *sel
   if (!var->value)
     return FALSE;
 
-  var->save_result.ulonglong_value= var->value->val_int();
   val= (time_t) var->save_result.ulonglong_value;
   if (val < (time_t) MY_TIME_T_MIN || val > (time_t) MY_TIME_T_MAX)
   {


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