bk commit into 5.0 tree (acurtis:1.1896)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of acurtis. When acurtis 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.1896 05/04/27 09:41:59 acurtis@stripped +4 -0
  Manual merge. Fixups in next cset

  sql/field.h
    1.154 05/04/27 09:41:41 acurtis@stripped +0 -3
    Manual merge. Fixups in next cset

  sql/item_cmpfunc.cc
    1.144 05/04/27 09:36:51 acurtis@stripped +0 -0
    Auto merged

  sql/item.h
    1.116 05/04/27 09:36:50 acurtis@stripped +0 -0
    Auto merged

  sql/field.cc
    1.257 05/04/27 09:36:49 acurtis@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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/.amd_mnt/bk.anubis/host/work-acurtis/bug9088.3/RESYNC

--- 1.256/sql/field.cc	2005-04-14 10:32:18 +01:00
+++ 1.257/sql/field.cc	2005-04-27 09:36:49 +01:00
@@ -1186,14 +1186,15 @@
 Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,
 	     uchar null_bit_arg,
 	     utype unireg_check_arg, const char *field_name_arg,
-	     struct st_table *table_arg)
+	     struct st_table *table_arg, bool unsigned_arg)
   :ptr(ptr_arg),null_ptr(null_ptr_arg),
    table(table_arg),orig_table(table_arg),
    table_name(table_arg ? &table_arg->alias : &unknown_table_name),
    field_name(field_name_arg),
    query_id(0), key_start(0), part_of_key(0), part_of_sortkey(0),
    unireg_check(unireg_check_arg),
-   field_length(length_arg),null_bit(null_bit_arg)
+   field_length(length_arg),null_bit(null_bit_arg),
+   unsigned_flag(unsigned_arg)
 {
   flags=null_ptr ? 0: NOT_NULL_FLAG;
   comment.str= (char*) "";

--- 1.153/sql/field.h	2005-04-14 10:32:18 +01:00
+++ 1.154/sql/field.h	2005-04-27 09:41:41 +01:00
@@ -87,10 +87,11 @@
   uint32	field_length;		// Length of field
   uint16	flags;
   uchar		null_bit;		// Bit used to test null bit
+  bool		unsigned_flag;
 
   Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,uchar null_bit_arg,
 	utype unireg_check_arg, const char *field_name_arg,
-	struct st_table *table_arg);
+	struct st_table *table_arg, bool unsigned_arg);
   virtual ~Field() {}
   /* Store functions returns 1 on overflow and -1 on fatal error */
   virtual int  store(const char *to,uint length,CHARSET_INFO *cs)=0;
@@ -325,7 +326,7 @@
 class Field_num :public Field {
 public:
   const uint8 dec;
-  bool zerofill,unsigned_flag;	// Purify cannot handle bit fields
+  bool zerofill;		// Purify cannot handle bit fields
   Field_num(char *ptr_arg,uint32 len_arg, uchar *null_ptr_arg,
 	    uchar null_bit_arg, utype unireg_check_arg,
 	    const char *field_name_arg,

--- 1.115/sql/item.h	2005-04-16 06:35:22 +01:00
+++ 1.116/sql/item.h	2005-04-27 09:36:50 +01:00
@@ -1363,6 +1363,11 @@
 {
   Item *ref;
 public:
+  Item_int_with_ref(Field *field, Item *ref_arg)
+    :Item_int(field->val_int()), ref(ref_arg)
+  {
+    unsigned_flag= field->unsigned_flag;
+  }
   Item_int_with_ref(longlong i, Item *ref_arg) :Item_int(i), ref(ref_arg)
   {
     unsigned_flag= ref_arg->unsigned_flag;

--- 1.143/sql/item_cmpfunc.cc	2005-04-01 09:07:51 +01:00
+++ 1.144/sql/item_cmpfunc.cc	2005-04-27 09:36:51 +01:00
@@ -188,7 +188,7 @@
   {
     if (!(*item)->save_in_field(field, 1) && !((*item)->null_value))
     {
-      Item *tmp=new Item_int_with_ref(field->val_int(), *item);
+      Item *tmp=new Item_int_with_ref(field, *item);
       if (tmp)
         thd->change_item_tree(item, tmp);
       return 1;					// Item was replaced