diff options
author | monty@mysql.com <> | 2006-06-04 21:05:22 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2006-06-04 21:05:22 +0300 |
commit | c46fb742b82d9e894fc8ec92ec18b804af48b1b2 (patch) | |
tree | 8e3365da0e05942d80e6e6ae092f7e0e40832fe2 /mysql-test/t/func_time.test | |
parent | b615e0b6dca974678ea6f9610f42ed4dbeb1bfe5 (diff) | |
parent | 74cc73d4619c94ceb1b93725b1bba7b802f2290d (diff) | |
download | mariadb-git-c46fb742b82d9e894fc8ec92ec18b804af48b1b2.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'mysql-test/t/func_time.test')
-rw-r--r-- | mysql-test/t/func_time.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 5c993028cb4..e6c1ddfcf1f 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -385,6 +385,7 @@ select time_format('100:00:00', '%H %k %h %I %l'); create table t1 (a timestamp default '2005-05-05 01:01:01', b timestamp default '2005-05-05 01:01:01'); delimiter //; +drop function if exists t_slow_sysdate; create function t_slow_sysdate() returns timestamp begin do sleep(2); |