bk commit into 5.1 tree (cmiller:1.2343)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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@stripped, 2006-11-06 17:46:50-05:00, cmiller@stripped +3 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my51-bug23411
  MERGE: 1.1810.1698.171

  BitKeeper/etc/collapsed@stripped, 2006-11-06 17:46:41-05:00, cmiller@stripped +1
-1
    auto-union
    MERGE: 1.5.1.8

  mysql-test/r/func_test.result@stripped, 2006-11-06 17:46:47-05:00,
cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.29.1.3

  sql/item_func.cc@stripped, 2006-11-06 17:46:47-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.270.1.41

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/bug23411/my51-bug23411/RESYNC

--- 1.327/sql/item_func.cc	2006-11-06 17:46:55 -05:00
+++ 1.328/sql/item_func.cc	2006-11-06 17:46:55 -05:00
@@ -105,7 +105,7 @@ Item_func::Item_func(THD *thd, Item_func
 
 
 /*
-  Resolve references to table column for a function and it's argument
+  Resolve references to table column for a function and its argument
 
   SYNOPSIS:
   fix_fields()
@@ -1394,6 +1394,13 @@ void Item_func_mod::result_precision()
 {
   decimals= max(args[0]->decimals, args[1]->decimals);
   max_length= max(args[0]->max_length, args[1]->max_length);
+}
+
+
+void Item_func_mod::fix_length_and_dec()
+{
+  Item_num_op::fix_length_and_dec();
+  maybe_null= 1;
 }
 
 

--- 1.15/BitKeeper/etc/collapsed	2006-11-06 17:46:55 -05:00
+++ 1.16/BitKeeper/etc/collapsed	2006-11-06 17:46:55 -05:00
@@ -15,3 +15,5 @@
 45214442pBGT9KuZEGixBH71jTzbOA
 45214a07hVsIGwvwa-WrO-jpeaSwVw
 452a92d0-31-8wSzSfZi165fcGcXPA
+454a7ef8gdvE_ddMlJyghvOAkKPNOQ
+454f8960jsVT_kMKJtZ9OCgXoba0xQ

--- 1.32/mysql-test/r/func_test.result	2006-11-06 17:46:55 -05:00
+++ 1.33/mysql-test/r/func_test.result	2006-11-06 17:46:55 -05:00
@@ -182,6 +182,80 @@ select 5.1 mod 3, 5.1 mod -3, -5.1 mod 3
 select 5 mod 3, 5 mod -3, -5 mod 3, -5 mod -3;
 5 mod 3	5 mod -3	-5 mod 3	-5 mod -3
 2	2	-2	-2
+select (12%0) <=> null      as '1';
+1
+1
+select (12%0) is null       as '1';
+1
+1
+select 12%0                 as 'NULL';
+NULL
+NULL
+select 12%2                 as '0';
+0
+0
+select 12%NULL              as 'NULL';
+NULL
+NULL
+select 12 % null            as 'NULL';
+NULL
+NULL
+select null % 12            as 'NULL';
+NULL
+NULL
+select null % 0             as 'NULL';
+NULL
+NULL
+select 0 % null             as 'NULL';
+NULL
+NULL
+select null % null          as 'NULL';
+NULL
+NULL
+select (12 mod 0) <=> null  as '1';
+1
+1
+select (12 mod 0) is null   as '1';
+1
+1
+select 12 mod 0             as 'NULL';
+NULL
+NULL
+select 12 mod 2             as '0';
+0
+0
+select 12 mod null          as 'NULL';
+NULL
+NULL
+select null mod 12          as 'NULL';
+NULL
+NULL
+select null mod 0           as 'NULL';
+NULL
+NULL
+select 0 mod null           as 'NULL';
+NULL
+NULL
+select null mod null        as 'NULL';
+NULL
+NULL
+select mod(12.0, 0)         as 'NULL';
+NULL
+NULL
+select mod(12, 0.0)         as 'NULL';
+NULL
+NULL
+select mod(12, NULL)        as 'NULL';
+NULL
+NULL
+select mod(12.0, NULL)      as 'NULL';
+NULL
+NULL
+select mod(NULL, 2)         as 'NULL';
+NULL
+NULL
+select mod(NULL, 2.0)       as 'NULL';
+NULL
 create table t1 (a int, b int);
 insert into t1 values (1,2), (2,3), (3,4), (4,5);
 select * from t1 where a not between 1 and 2;