Commit 6fce7146 authored by Horst Hunger's avatar Horst Hunger
Browse files

Fix for bug#37702: Inserted the review results into the patch.

parent 9300f20d

mysql-test/r/timestamp_func.result

+18 −26
Original line number Diff line number Diff line 
** Setup **



** Connecting con0 using root **

** Connecting con1 using root **

'#-----------------------------FN_DYNVARS_179_01------------------#'

** Connection con0 **

SET @ts_old = @@SESSION.timestamp;

waiting 1 sec

SET @ts_new = @@SESSION.timestamp;

SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';

Timestamp Difference

SELECT date(now()) = date(sysdate());

date(now()) = date(sysdate())

1

SET @@session.timestamp = 1100000000;

SELECT date(now()) != date(sysdate());

date(now()) != date(sysdate())

1

** Connecting con0 using root **

SELECT @@session.timestamp != 1100000000;

@@session.timestamp != 1100000000

1

SET @@session.timestamp = 1000000000;

SELECT date(now()) != date(sysdate());

date(now()) != date(sysdate())

1

1 means >=1 expected is true

** Connection con1 **

SET @ts_old = @@SESSION.timestamp;

waiting 4 sec

SET @ts_new = @@SESSION.timestamp;

SELECT @ts_new - @ts_old >= 4 AS 'Timestamp Difference';

Timestamp Difference

SELECT @@session.timestamp != 1000000000;

@@session.timestamp != 1000000000

1

1 means >=4 expected is true

'#-----------------------------FN_DYNVARS_179_02---------------------#'

SET @ts_old = @@SESSION.timestamp;

Changing time zone

SET time_zone = 'MET';

SET @ts_new = @@SESSION.timestamp;

SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';

Timestamp Difference

SELECT @@session.timestamp = 1100000000;

@@session.timestamp = 1100000000

1

1 means >=1 expected is true

** Cleanup **

** Connection default **

Disconnecting Connections con0, con1

mysql-test/r/timestamp_sysdate_is_now_func.result

0 → 100644
+25 −0
Original line number Diff line number Diff line 
** Connecting con1 using root **

SELECT date(now()) = date(sysdate());

date(now()) = date(sysdate())

1

SET @@session.timestamp = 1100000000;

SELECT date(now()) != date(sysdate());

date(now()) != date(sysdate())

0

** Connecting con0 using root **

SELECT @@session.timestamp != 1100000000;

@@session.timestamp != 1100000000

1

SET @@session.timestamp = 1000000000;

SELECT date(now()) != date(sysdate());

date(now()) != date(sysdate())

0

** Connection con1 **

SELECT @@session.timestamp != 1000000000;

@@session.timestamp != 1000000000

1

SELECT @@session.timestamp = 1100000000;

@@session.timestamp = 1100000000

1

** Connection default **

Disconnecting Connections con0, con1

mysql-test/t/timestamp_func.test

+20 −49
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
# Creation Date: 2008-02-25                                                #

# Author:  Sharique Abdullah                                               #

#                                                                          #

# Modified: HHunger 2008-08-28 Reimplemented the test completely.          #

#                                                                          #

# Description: Test Cases of Dynamic System Variable "timestamp"           #

#              that checks behavior of this variable in the following ways #

#              * Functionality based on different values                   #
@@ -17,63 +19,32 @@ 
#                                                                          #

############################################################################



--echo ** Setup **

--echo

#

# Setup

#

--echo ** Connecting con0 using root **

connect (con0,localhost,root,,);

# Change timestamp which must have an effect on now(), but not on sysdate().

# Use Unix epoch timestamp

# All comparisons must deliver true(1)

# Exception: --sysdate-is-now switches off this behaviour and must not be set.



--echo ** Connecting con1 using root **

connect (con1,localhost,root,,);

SELECT date(now()) = date(sysdate());

SET @@session.timestamp = 1100000000;

SELECT date(now()) != date(sysdate());



--echo '#-----------------------------FN_DYNVARS_179_01------------------#'

#

# Checking for connection 1

#



--echo ** Connection con0 **

connection con0;

SET @ts_old = @@SESSION.timestamp;

--echo waiting 1 sec

--sleep 1

SET @ts_new = @@SESSION.timestamp;

SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';

--echo 1 means >=1 expected is true



# Assure that setting of the variable has no effect on other session.

--echo ** Connecting con0 using root **

connect (con0,localhost,root,,);

SELECT @@session.timestamp != 1100000000;

SET @@session.timestamp = 1000000000;

SELECT date(now()) != date(sysdate());



#

# Checking for connection 2

#

--echo ** Connection con1 **

connection con1;

SET @ts_old = @@SESSION.timestamp;

--echo waiting 4 sec

--sleep 4

SET @ts_new = @@SESSION.timestamp;

SELECT @ts_new - @ts_old >= 4 AS 'Timestamp Difference';

--echo 1 means >=4 expected is true



--echo '#-----------------------------FN_DYNVARS_179_02---------------------#'

#

# Testing timezone change effect

#



SET @ts_old = @@SESSION.timestamp;

--sleep 1

--echo Changing time zone

SET time_zone = 'MET';

SET @ts_new = @@SESSION.timestamp;

SELECT @ts_new - @ts_old >= 1 AS 'Timestamp Difference';

--echo 1 means >=1 expected is true



#

# Cleanup

#

--echo ** Cleanup **

SELECT @@session.timestamp != 1000000000;

SELECT @@session.timestamp = 1100000000;



--echo ** Connection default **

connection default;

--echo Disconnecting Connections con0, con1

disconnect con0;

disconnect con1;

mysql-test/t/timestamp_sysdate_is_now_func-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--sysdate-is-now

mysql-test/t/timestamp_sysdate_is_now_func.test

0 → 100644
+47 −0
Original line number Diff line number Diff line 
############################################################################

#                                                                          #

# Variable Name: timestamp with sysdate-is-now                             #

# Scope: GLOBAL                                                            #

# Access Type: Dynamic                                                     #

# Data Type: INTEGER                                                       #

#                                                                          #

#                                                                          #

# Creation Date: 2008-11-25                                                #

# Author:  Horst Hunger                                                    #

#                                                                          #

# Description: Test Cases of Dynamic System Variable "timestamp"           #

#              that checks behavior of this variable in the following ways #

#              * Like timstamp_func, but with set "sysdate-is-now".        #

#                                                                          #

# Reference: http://dev.mysql.com/doc/refman/5.1/en/set-option.html        #

#                                                                          #

############################################################################



# Use Unix epoch timestamp

# Due to "--sysdate-is-now" timestamp must have an effect on both.

# See also timestamp_func.test.



--echo ** Connecting con1 using root **

connect (con1,localhost,root,,);

SELECT date(now()) = date(sysdate());

SET @@session.timestamp = 1100000000;

SELECT date(now()) != date(sysdate());



# Assure that setting of the variable has no effect on other session.

--echo ** Connecting con0 using root **

connect (con0,localhost,root,,);

SELECT @@session.timestamp != 1100000000;

SET @@session.timestamp = 1000000000;

SELECT date(now()) != date(sysdate());



--echo ** Connection con1 **

connection con1;

SELECT @@session.timestamp != 1000000000;

SELECT @@session.timestamp = 1100000000;



--echo ** Connection default **

connection default;

--echo Disconnecting Connections con0, con1

disconnect con0;

disconnect con1;