summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <hf@eagle.intranet.mysql.r18.ru>2006-01-21 17:55:58 +0400
committerunknown <hf@eagle.intranet.mysql.r18.ru>2006-01-21 17:55:58 +0400
commitffe11393c9ce64a064faa2b85d3fb78de9adc013 (patch)
tree4d065fe4060510ac7ea017c22ab0b3a0a11e0014
parenta8e1b4683455fc252a6acda96abe31651d9d1e34 (diff)
parent2c29ced92859413585cb4cebc85b69bba408940d (diff)
downloadmariadb-git-ffe11393c9ce64a064faa2b85d3fb78de9adc013.tar.gz
Merge hf@192.168.21.12:work/mysql-4.1.15429
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
-rw-r--r--mysql-test/t/func_math.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test
index a8f62e38e86..c22c09ab62b 100644
--- a/mysql-test/t/func_math.test
+++ b/mysql-test/t/func_math.test
@@ -91,7 +91,9 @@ drop table t1;
#
# InnoDB is required to reproduce the fault, but it is okay if we default to
# MyISAM when testing.
+--disable_warnings
create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default charset=utf8;
+--enable_warnings
insert into t1 values ('http://www.foo.com/', now());
select a from t1 where a='http://www.foo.com/' order by abs(timediff(ts, 0));
drop table t1;