diff options
| author | unknown <hf@eagle.intranet.mysql.r18.ru> | 2006-01-21 18:50:06 +0400 |
|---|---|---|
| committer | unknown <hf@eagle.intranet.mysql.r18.ru> | 2006-01-21 18:50:06 +0400 |
| commit | 494bccf044edd91363bf4b296dbc0cbbdc4e4bf9 (patch) | |
| tree | ba57b634fbff540434a56e3ce0639c85ec0f82ea /mysql-test/t/func_math.test | |
| parent | ff3079c8d0f27a54b55cb2685aa9fd1cb498bc1a (diff) | |
| parent | ffe11393c9ce64a064faa2b85d3fb78de9adc013 (diff) | |
| download | mariadb-git-494bccf044edd91363bf4b296dbc0cbbdc4e4bf9.tar.gz | |
Merging
mysql-test/ndb/ndbcluster.sh:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
sql/spatial.h:
Auto merged
mysql-test/r/type_float.result:
merging
sql/item_func.cc:
merging
Diffstat (limited to 'mysql-test/t/func_math.test')
| -rw-r--r-- | mysql-test/t/func_math.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test index 24dd18daab1..9cf0ee452cd 100644 --- a/mysql-test/t/func_math.test +++ b/mysql-test/t/func_math.test @@ -121,7 +121,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; |