bk commit into 4.1 tree (holyfoot:1.2488) BUG#15429

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2488 05/12/10 19:12:06 holyfoot@deer.(none) +4 -0
  Fix for bug #15429 (func_math fails --without-innodb)

  mysql-test/t/innodb.test
    1.77 05/12/10 19:11:06 holyfoot@stripped +10 -0
    added testcase for #14009 here for innodb case

  mysql-test/t/func_math.test
    1.19 05/12/10 19:11:06 holyfoot@stripped +1 -1
    removed 'engine=innodb'

  mysql-test/r/innodb.result
    1.106 05/12/10 19:11:06 holyfoot@stripped +6 -0
    test result fixed

  mysql-test/r/func_math.result
    1.26 05/12/10 19:11:06 holyfoot@stripped +1 -1
    test result fixed

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.15429

--- 1.25/mysql-test/r/func_math.result	Tue Oct 18 05:00:35 2005
+++ 1.26/mysql-test/r/func_math.result	Sat Dec 10 19:11:06 2005
@@ -145,7 +145,7 @@
 select rand(i) from t1;
 ERROR HY000: Incorrect arguments to RAND
 drop table t1;
-create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default
charset=utf8;
+create table t1 (a varchar(90), ts datetime not null, index (a)) default charset=utf8;
 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));
 a

--- 1.105/mysql-test/r/innodb.result	Wed Sep 28 16:14:40 2005
+++ 1.106/mysql-test/r/innodb.result	Sat Dec 10 19:11:06 2005
@@ -1722,3 +1722,9 @@
 Table	Checksum
 test.test_checksum	2050879373
 drop table test_checksum;
+create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default
charset=utf8;
+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));
+a
+http://www.foo.com/
+drop table t1;

--- 1.18/mysql-test/t/func_math.test	Tue Oct 18 05:00:35 2005
+++ 1.19/mysql-test/t/func_math.test	Sat Dec 10 19:11:06 2005
@@ -91,7 +91,7 @@
 #
 # InnoDB is required to reproduce the fault, but it is okay if we default to
 # MyISAM when testing.
-create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default
charset=utf8;
+create table t1 (a varchar(90), ts datetime not null, index (a)) default charset=utf8;
 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;

--- 1.76/mysql-test/t/innodb.test	Wed Sep 28 16:14:40 2005
+++ 1.77/mysql-test/t/innodb.test	Sat Dec 10 19:11:06 2005
@@ -1280,4 +1280,14 @@
 checksum table test_checksum;
 drop table test_checksum;
 
+#
+# Bug #14009: use of abs() on null value causes problems with filesort
+#
+# InnoDB is required to reproduce the fault, but it is okay if we default to
+# MyISAM when testing.
+create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default
charset=utf8;
+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;
+
 # End of 4.1 tests