From: Alexander Barkov
Date: May 18 2011 8:01pm
Subject: bzr commit into mysql-trunk branch (alexander.barkov:3365) WL#946
List-Archive: http://lists.mysql.com/commits/137554
Message-Id: <201105182001.p4IK1cYC016367@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0377230050742222395=="

--===============0377230050742222395==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bar/mysql-bzr/mysql-trunk-wl946/ based on revid:alexander.barkov@stripped

 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 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2011-05-18 17:21:03 +0000
+++ b/sql/sys_vars.cc	2011-05-18 19:59:19 +0000
@@ -2730,7 +2730,7 @@ static bool check_timestamp(sys_var *sel
 static Sys_var_session_special_double Sys_timestamp(
        "timestamp", "Set the time for this client",
        sys_var::ONLY_SESSION, NO_CMD_LINE,
-       VALID_RANGE(0, ~(time_t)0), BLOCK_SIZE(1),
+       VALID_RANGE(0, TIMESTAMP_MAX_VALUE + 1), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_timestamp), 
        ON_UPDATE(update_timestamp), ON_READ(read_timestamp));
 


--===============0377230050742222395==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/alexander.barkov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.barkov@stripped\
#   o1m59v3z2b7h7poh
# target_branch: file:///home/bar/mysql-bzr/mysql-trunk-wl946/
# testament_sha1: 21804cd628e7b95327e373b994a7facb4372bd7f
# timestamp: 2011-05-19 00:01:38 +0400
# base_revision_id: alexander.barkov@stripped\
#   uspdjhqq8ep9qswc
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVVRXrQAAZdfgAgQWO//936v
39C////xUAPm3ptLk100VAamjSGSnlMynqNpNHqNDQDIBjSaaep4RlASlGhJsMIRHtTSGgaaHqAG
QAANASimJoYjRDRTejVHlPKB6QABoAANDjJk00wmRkDAjE0YIwg0aYABBJIEU8Ck/CNSabTU8iYT
1BpmoD1GgGjTRPDhfL7niKSVSIsCb8AAOXPglW8uGk8LYkK0iDZk4p2ERCj6RWb02NQjBqVt2Rx0
8in9+iOxxIWXZVdZMlrHYGGh80hYc5sNF+jXizt5+FKFQz9Udww615apYK93BJTJmQhv31RHb4j2
XpQtbYvUhRBWkeiFLJ1UX4xKarlQ5TNAIQrGewXnc4RdCJgUkSZRTkxNOxGHqoXEydU7T2cnkpC+
CPGZKBCkVEpS8Es7fpJVm7NMVhju4BDYsEjEqJ1snuZlEreCauEMLcQ/BE4UlhUTRyV1h/CXnS4o
C3IjEpiRCCk6q1G3KweTckR/PDpEZZCUU4mWb4b/ixZ5bFxEs75FQjH/aDNCmQtITc4s5UX5NjRA
vvMMmQrKhYsS1vREoK3rYG2hC0vHK8g+CZCwE4iSdAvJowQoGvH8B89l1NcnMpzOwGt4miRaUCKu
ulxEWaKIFZqyr1BIUX79A8rQ6lz8mjY4aTJnCMOgOOlJ5jugZ2yIVk95mdSEDPYK6qJbw3iIiDB6
U0Wflrra9MO2rdX1ldCkPNMXr4aS6l8DzLd1t3jjk6SAnHz8JBiJFxFRDzHX1TpE0nB2fQuDoOkZ
3fCyawbwBW+P57A3xafikPlJ56TFqZoW7Tq2m7aLd2pFZKJWdpR1hUFm46jqilntPukFuqy23sOh
iohYiE3Dq1SzSX77S+yvdapljgPlJYFu4hrkCwy0C2fen7X85yanT6nvBXWdzqx8ZUaxkzT45tyC
GigI165I0dIultrYoNv1pitW7ZgZphLTmTLILqczAs7r4NLhzvIuHDQC0yBRUOGs4dLsLi2NZZ0c
G8a7XHLBnmtDFOVoWNrE7EGovKJeARRpoV5iS/HJFdiTS9gbLswlz7mvQ3SJmG1iybC0LS+5u4nv
DAFh+zMFQVONjEec46khjbBIuZtnS1EtCR0ia1NPDJhzF2ePl0SJidp5CjF4MCfiPcz3ZVys3o3o
nZMp6uNUCsno1idgkZ2oFy4D4lH6SChZFHWNTbPccASotwCZiqo0aGakK8+IjNg+euQTkugOYKzg
aphJwOSTaXZnorq4/ET8UgU6u6cdlM6X1UUiozr4UOLtw/Ymp2D8FkeXzN3q3eFZRBM8aoA4rlIS
AYrkFV2m27srGule+QHjWMvmnBTxUxx8HHAzqL7QuBdVbEwjjI107rqIwvoiHKveIqIa0LkxErB9
AJNUg5Tma/cVcu8JxMYEMjd/xdyRThQkFVRXrQA=


--===============0377230050742222395==--