bk commit into 5.0 tree (jimw:1.1949)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1949 05/10/27 18:46:00 jimw@stripped +3 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/item_func.cc
    1.263 05/10/27 18:45:57 jimw@stripped +1 -1
    Resolve conflict

  mysql-test/r/func_math.result
    1.32 05/10/27 18:45:56 jimw@stripped +0 -0
    Resolve conflict

  mysql-test/t/func_math.test
    1.24 05/10/27 18:41:13 jimw@stripped +0 -0
    Auto merged

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.262/sql/item_func.cc	2005-10-27 12:45:06 -07:00
+++ 1.263/sql/item_func.cc	2005-10-27 18:45:57 -07:00
@@ -636,6 +636,7 @@
 {
   decimals= args[0]->decimals;
   max_length= args[0]->max_length;
+  maybe_null= 1;
 }
 
 

--- 1.31/mysql-test/r/func_math.result	2005-10-17 00:30:01 -07:00
+++ 1.32/mysql-test/r/func_math.result	2005-10-27 18:45:56 -07:00
@@ -170,6 +170,12 @@
 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;
+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;
 set sql_mode='traditional';
 select ln(-1);
 ln(-1)

--- 1.23/mysql-test/t/func_math.test	2005-10-17 00:30:01 -07:00
+++ 1.24/mysql-test/t/func_math.test	2005-10-27 18:41:13 -07:00
@@ -116,6 +116,16 @@
 select rand(i) from t1;
 drop table t1;
 
+#
+# 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
 
 #