diff options
| author | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-11-17 21:32:08 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-11-17 21:32:08 +0100 |
| commit | 6d1d89c0c4e2efad49a8a855dc2443b28d4e8b02 (patch) | |
| tree | db680363252b53a5c24c20f5cdc04b2bea86878d /mysql-test/t/func_time.test | |
| parent | 9a0d4714e627cd3c33b5cce7712d89183a9e540a (diff) | |
| parent | 9760859776d5778850bf2ac82c532fb95512bcf9 (diff) | |
| download | mariadb-git-6d1d89c0c4e2efad49a8a855dc2443b28d4e8b02.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/func_time.test')
| -rw-r--r-- | mysql-test/t/func_time.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 7cdc835fa60..b5e09ffda91 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -586,6 +586,8 @@ select time_format('100:00:00', '%H %k %h %I %l'); # Bug #12562: Make SYSDATE behave like it does in Oracle: always the current # time, regardless of magic to make NOW() always the same for the # entirety of a statement. +SET GLOBAL log_bin_trust_function_creators = 1; + create table t1 (a timestamp default '2005-05-05 01:01:01', b timestamp default '2005-05-05 01:01:01'); delimiter //; @@ -615,6 +617,8 @@ drop trigger t_before; drop function t_slow_sysdate; drop table t1; +SET GLOBAL log_bin_trust_function_creators = 0; + create table t1 (a datetime, i int, b datetime); insert into t1 select sysdate(), sleep(1), sysdate() from dual; select a != b from t1; |