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 | e46dbc9b52537a168cf28793b0dae70a21ac9b90 (patch) | |
| tree | db680363252b53a5c24c20f5cdc04b2bea86878d /mysql-test/r/func_time.result | |
| parent | 0aad12d99e6bca631a04c5c52e31d9298da91222 (diff) | |
| parent | b84e9d10b44f516987ed582547d9c891ef36040f (diff) | |
| download | mariadb-git-e46dbc9b52537a168cf28793b0dae70a21ac9b90.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/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 4bbc331c934..4df7e6d3a53 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1060,6 +1060,7 @@ Note 1003 select timestampdiff(WEEK,_latin1'2001-02-01',_latin1'2001-05-01') AS select time_format('100:00:00', '%H %k %h %I %l'); time_format('100:00:00', '%H %k %h %I %l') 100 100 04 04 4 +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'); drop function if exists t_slow_sysdate; @@ -1083,6 +1084,7 @@ a != b 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; |