From: Alexander Barkov
Date: May 18 2011 8:01pm
Subject: bzr push into mysql-trunk branch (alexander.barkov:3364 to 3365) WL#946
List-Archive: http://lists.mysql.com/commits/137555
Message-Id: <201105182001.p4IK1sLT016376@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 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
 3364 Alexander Barkov	2011-05-18
      WL#946, new version.

    added:
      mysql-test/r/a.result
      mysql-test/suite/rpl/r/rpl_fsp.result
      mysql-test/suite/rpl/t/rpl_fsp.test
      mysql-test/t/a.test
    modified:
      client/mysqlbinlog.cc
      client/mysqltest.cc
      include/decimal.h
      include/my_global.h
      include/my_time.h
      libmysql/libmysql.c
      mysql-test/r/cast.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/date_formats.result
      mysql-test/r/deprecated_features.result
      mysql-test/r/func_sapdb.result
      mysql-test/r/func_time.result
      mysql-test/r/mysqlbinlog_row.result
      mysql-test/r/parser.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/ps_2myisam.result
      mysql-test/r/ps_3innodb.result
      mysql-test/r/ps_4heap.result
      mysql-test/r/ps_5merge.result
      mysql-test/r/sp-vars.result
      mysql-test/r/sp.result
      mysql-test/r/strict.result
      mysql-test/r/sysdate_is_now.result
      mysql-test/r/timezone2.result
      mysql-test/r/timezone_grant.result
      mysql-test/r/type_date.result
      mysql-test/r/type_datetime.result
      mysql-test/r/type_time.result
      mysql-test/r/type_timestamp.result
      mysql-test/r/view.result
      mysql-test/suite/funcs_1/r/innodb_func_view.result
      mysql-test/suite/funcs_1/r/memory_func_view.result
      mysql-test/suite/funcs_1/r/myisam_func_view.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/funcs_1/views/func_view.inc
      mysql-test/suite/innodb/r/innodb_bug52745.result
      mysql-test/suite/rpl/r/rpl_timezone.result
      mysql-test/suite/sys_vars/r/timestamp_basic.result
      mysql-test/suite/sys_vars/t/timestamp_basic.test
      mysql-test/t/cast.test
      mysql-test/t/deprecated_features.test
      mysql-test/t/func_time.test
      mysql-test/t/mysqlbinlog_row.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/strict.test
      mysql-test/t/type_time.test
      sql-common/my_time.c
      sql/event_data_objects.cc
      sql/event_db_repository.cc
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_create.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysqld.cc
      sql/opt_range.cc
      sql/protocol.cc
      sql/protocol.h
      sql/rpl_slave.cc
      sql/rpl_utility.cc
      sql/share/errmsg-utf8.txt
      sql/sp.cc
      sql/sp_head.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_const.h
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_insert.cc
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_show.cc
      sql/sql_time.cc
      sql/sql_time.h
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/sys_vars.h
      sql/table.cc
      sql/table.h
      storage/innobase/handler/ha_innodb.cc
      strings/decimal.c
      tests/mysql_client_test.c
=== 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));
 

No bundle (reason: useless for push emails).