mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.20-bug15101-sysdate
This commit is contained in:
4
mysql-test/r/sysdate_is_now.result
Normal file
4
mysql-test/r/sysdate_is_now.result
Normal file
@ -0,0 +1,4 @@
|
||||
set timestamp=1;
|
||||
SELECT sleep(1),NOW()-SYSDATE() as zero;
|
||||
sleep(1) zero
|
||||
0 0
|
1
mysql-test/t/sysdate_is_now-master.opt
Normal file
1
mysql-test/t/sysdate_is_now-master.opt
Normal file
@ -0,0 +1 @@
|
||||
--sysdate-is-now
|
11
mysql-test/t/sysdate_is_now.test
Normal file
11
mysql-test/t/sysdate_is_now.test
Normal file
@ -0,0 +1,11 @@
|
||||
#
|
||||
# BUG#15101 restore aliasing of SYSDATE to NOW in 5.0
|
||||
# this feature is activated via --sysdate-is-now mysqld init opt
|
||||
#
|
||||
# To test here
|
||||
# 1. SYSDATE() does not distiguish from NOW()
|
||||
# 2. SYSDATE() obeys set timestamp
|
||||
|
||||
set timestamp=1;
|
||||
SELECT sleep(1),NOW()-SYSDATE() as zero;
|
||||
# End of 5.0 tests
|
Reference in New Issue
Block a user