Commit 50ba1a09 authored by unknown's avatar unknown
Browse files

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
parents 22b754d8 bf622dad

configure.in

+7 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,13 @@ then 
  AC_MSG_ERROR("MySQL needs a off_t type.")

fi



dnl

dnl check if time_t is unsigned

dnl



MYSQL_CHECK_TIME_T





# do we need #pragma interface/#pragma implementation ?

# yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin

AC_MSG_CHECKING(the need for @%:@pragma interface/implementation)

include/my_time.h

+30 −0
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ typedef long my_time_t; 
#define MY_TIME_T_MAX LONG_MAX

#define MY_TIME_T_MIN LONG_MIN



/* Time handling defaults */

#define TIMESTAMP_MAX_YEAR 2038

#define TIMESTAMP_MIN_YEAR (1900 + YY_PART_YEAR - 1)

#define TIMESTAMP_MAX_VALUE INT_MAX32

#define TIMESTAMP_MIN_VALUE 1



/* two-digit years < this are 20..; >= this are 19.. */

#define YY_PART_YEAR	   70

/* apply above magic to years < this */
@@ -76,6 +82,30 @@ uint calc_days_in_year(uint year); 


void init_time(void);





/*

  Function to check sanity of a TIMESTAMP value



  DESCRIPTION

    Check if a given MYSQL_TIME value fits in TIMESTAMP range.

    This function doesn't make precise check, but rather a rough

    estimate.



  RETURN VALUES

    FALSE   The value seems sane

    TRUE    The MYSQL_TIME value is definitely out of range

*/



static inline bool validate_timestamp_range(const MYSQL_TIME *t)

{

  if ((t->year > TIMESTAMP_MAX_YEAR || t->year < TIMESTAMP_MIN_YEAR) ||

      (t->year == TIMESTAMP_MAX_YEAR && (t->month > 1 || t->day > 19)) ||

      (t->year == TIMESTAMP_MIN_YEAR && (t->month < 12 || t->day < 31)))

    return FALSE;



  return TRUE;

}



my_time_t 

my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone,

                  my_bool *in_dst_time_gap);

mysql-test/mysql-test-run.pl

+8 −1
Original line number Diff line number Diff line
@@ -3621,6 +3621,14 @@ sub run_testcase_start_servers($) { 
    return;

  }



  #

  # Set the timezone, in the case it was specified in the test

  # We need to do this before the server is started, as mysqld

  # uses this information at startup

  #

  

  $ENV{'TZ'}= $tinfo->{'timezone'};

  

  if ( $tinfo->{'component_id'} eq 'mysqld' )

  {

    if ( ! $opt_skip_ndbcluster and
@@ -3985,7 +3993,6 @@ sub run_mysqltest ($) { 
  # -------------------------------------------------------

  # Init variables that change for each testcase

  # -------------------------------------------------------

  $ENV{'TZ'}= $tinfo->{'timezone'};



  my $res = mtr_run_test($exe,$args,"","",$path_timefile,"");

mysql-test/r/func_time.result

+38 −2
Original line number Diff line number Diff line
@@ -548,12 +548,48 @@ unix_timestamp('1969-12-01 19:00:01') 
select from_unixtime(-1);

from_unixtime(-1)

NULL

select from_unixtime(2145916800);

from_unixtime(2145916800)

select from_unixtime(2147483647);

from_unixtime(2147483647)

2038-01-19 06:14:07

select from_unixtime(2147483648);

from_unixtime(2147483648)

NULL

select from_unixtime(0);

from_unixtime(0)

1970-01-01 03:00:00

select unix_timestamp(from_unixtime(2147483647));

unix_timestamp(from_unixtime(2147483647))

2147483647

select unix_timestamp(from_unixtime(2147483648));

unix_timestamp(from_unixtime(2147483648))

NULL

select unix_timestamp('2039-01-20 01:00:00');

unix_timestamp('2039-01-20 01:00:00')

0

select unix_timestamp('1968-01-20 01:00:00');

unix_timestamp('1968-01-20 01:00:00')

0

select unix_timestamp('2038-02-10 01:00:00');

unix_timestamp('2038-02-10 01:00:00')

0

select unix_timestamp('1969-11-20 01:00:00');

unix_timestamp('1969-11-20 01:00:00')

0

select unix_timestamp('2038-01-20 01:00:00');

unix_timestamp('2038-01-20 01:00:00')

0

select unix_timestamp('1969-12-30 01:00:00');

unix_timestamp('1969-12-30 01:00:00')

0

select unix_timestamp('2038-01-17 12:00:00');

unix_timestamp('2038-01-17 12:00:00')

2147331600

select unix_timestamp('1970-01-01 03:00:01');

unix_timestamp('1970-01-01 03:00:01')

1

select unix_timestamp('2038-01-19 07:14:07');

unix_timestamp('2038-01-19 07:14:07')

0

CREATE TABLE t1 (datetime datetime, timestamp timestamp, date date, time time);

INSERT INTO t1 values ("2001-01-02 03:04:05", "2002-01-02 03:04:05", "2003-01-02", "06:07:08");

SELECT * from t1;

mysql-test/r/timezone.result

+4 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ Warning 1299 Invalid TIMESTAMP value in column 'ts' at row 2 
DROP TABLE t1;

select unix_timestamp('1970-01-01 01:00:00'), 

unix_timestamp('1970-01-01 01:00:01'),

unix_timestamp('2038-01-01 00:59:59'),

unix_timestamp('2038-01-01 01:00:00');

unix_timestamp('1970-01-01 01:00:00')	unix_timestamp('1970-01-01 01:00:01')	unix_timestamp('2038-01-01 00:59:59')	unix_timestamp('2038-01-01 01:00:00')

0	1	2145916799	0
 
unix_timestamp('2038-01-19 04:14:07'),

unix_timestamp('2038-01-19 04:14:08');

unix_timestamp('1970-01-01 01:00:00')	unix_timestamp('1970-01-01 01:00:01')	unix_timestamp('2038-01-19 04:14:07')	unix_timestamp('2038-01-19 04:14:08')

0	1	2147483647	0