bk commit into 5.0 tree (kaa:1.2266)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa 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-09-13 19:32:21+04:00, kaa@stripped +3 -0
  Fixed the faulty merge

  sql/item_func.cc@stripped, 2006-09-13 19:32:17+04:00, kaa@stripped +5 -3
    Fixed the faulty merge

  sql/log_event.cc@stripped, 2006-09-13 19:32:18+04:00, kaa@stripped +1 -1
    Fixed the faulty merge

  sql/sql_class.h@stripped, 2006-09-13 19:32:18+04:00, kaa@stripped +1 -0
    Fixed the faulty merge

# 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:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/m50-maint--07OGt

--- 1.302/sql/item_func.cc	2006-09-13 19:32:27 +04:00
+++ 1.303/sql/item_func.cc	2006-09-13 19:32:27 +04:00
@@ -3422,6 +3422,7 @@ static user_var_entry *get_variable(HASH
     entry->length=0;
     entry->update_query_id=0;
     entry->collation.set(NULL, DERIVATION_IMPLICIT);
+    entry->unsigned_flag= 0;
     /*
       If we are here, we were called from a SET or a query which sets a
       variable. Imagine it is this:
@@ -3565,6 +3566,7 @@ update_hash(user_var_entry *entry, bool 
       ((my_decimal*)entry->value)->fix_buffer_pointer();
     entry->length= length;
     entry->collation.set(cs, dv);
+    entry->unsigned_flag= unsigned_arg;
   }
   entry->type=type;
   return 0;
@@ -3797,7 +3799,7 @@ Item_func_set_user_var::update()
   case REAL_RESULT:
   {
     res= update_hash((void*) &save_result.vreal,sizeof(save_result.vreal),
-		     REAL_RESULT, &my_charset_bin, DERIVATION_IMPLICIT);
+		     REAL_RESULT, &my_charset_bin, DERIVATION_IMPLICIT, 0);
     break;
   }
   case INT_RESULT:
@@ -3811,12 +3813,12 @@ Item_func_set_user_var::update()
   {
     if (!save_result.vstr)					// Null value
       res= update_hash((void*) 0, 0, STRING_RESULT, &my_charset_bin,
-		       DERIVATION_IMPLICIT);
+		       DERIVATION_IMPLICIT, 0);
     else
       res= update_hash((void*) save_result.vstr->ptr(),
 		       save_result.vstr->length(), STRING_RESULT,
 		       save_result.vstr->charset(),
-		       DERIVATION_IMPLICIT);
+		       DERIVATION_IMPLICIT, 0);
     break;
   }
   case DECIMAL_RESULT:

--- 1.210/sql/log_event.cc	2006-09-13 19:32:27 +04:00
+++ 1.211/sql/log_event.cc	2006-09-13 19:32:27 +04:00
@@ -3846,7 +3846,7 @@ int User_var_log_event::exec_event(struc
     a single record and with a single column. Thus, like
     a column value, it could always have IMPLICIT derivation.
    */
-  e.update_hash(val, val_len, type, charset, DERIVATION_IMPLICIT);
+  e.update_hash(val, val_len, type, charset, DERIVATION_IMPLICIT, 0);
   free_root(thd->mem_root,0);
 
   rli->inc_event_relay_log_pos();

--- 1.297/sql/sql_class.h	2006-09-13 19:32:27 +04:00
+++ 1.298/sql/sql_class.h	2006-09-13 19:32:27 +04:00
@@ -2016,6 +2016,7 @@ class user_var_entry
   ulong length;
   query_id_t update_query_id, used_query_id;
   Item_result type;
+  bool unsigned_flag;
 
   double val_real(my_bool *null_value);
   longlong val_int(my_bool *null_value);