List:Commits« Previous MessageNext Message »
From:pkarthick Date:January 16 2006 5:13am
Subject:bk commit into 5.1 tree (pkarthick:1.2056)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of prem. When prem 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.2056 06/01/16 10:43:38 pkarthick@stripped +1 -0
  Merge bk://mysql.bkbits.net/mysql-5.1-new
  into  novell.com:/home/prem/bk/mysql-5.1

  sql/sql_class.cc
    1.235 06/01/16 10:43:30 pkarthick@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:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/mysql-5.1/RESYNC

--- 1.234/sql/sql_class.cc	2006-01-11 09:54:34 +05:30
+++ 1.235/sql/sql_class.cc	2006-01-16 10:43:30 +05:30
@@ -455,7 +455,12 @@
 
 
 /*
-  Add to one status variable another status variable
+  Add all status variables to another status variable array
+
+  SYNOPSIS
+   add_to_status()
+   to_var       add to this array
+   from_var     from this array
 
   NOTES
     This function assumes that all variables are long/ulong.
@@ -2328,7 +2333,7 @@
   for (uint *ptr= beg ; ptr != end ; ++ptr)
   {
     Field_blob* const blob= (Field_blob*) table->field[*ptr];
-    length+= blob->get_length(data + blob->offset()) + 2;
+    length+= blob->get_length((const char *) (data + blob->offset())) + 2;
   }
 
   return length;
@@ -2347,7 +2352,7 @@
   for (int i= 0 ; field ; i++, p_field++, field= *p_field)
   {
     if (bitmap_is_set(cols,i))
-      ptr= (byte*)field->pack(ptr, field->ptr + offset);
+      ptr= (byte*)field->pack((char *) ptr, field->ptr + offset);
   }
 
   /*
@@ -2380,12 +2385,12 @@
     if (!table->s->blob_fields)
     {
       /* multiply max_len by 2 so it can be used for update_row as well */
-      table->write_row_record= alloc_root(&table->mem_root, 2*max_len);
+      table->write_row_record= (byte *) alloc_root(&table->mem_root, 2*max_len);
       if (!table->write_row_record)
         return HA_ERR_OUT_OF_MEM;
       row_data= table->write_row_record;
     }
-    else if (unlikely(!(row_data= my_malloc(max_len, MYF(MY_WME)))))
+    else if (unlikely(!(row_data= (byte *) my_malloc(max_len, MYF(MY_WME)))))
       return HA_ERR_OUT_OF_MEM;
   }
   my_size_t const len= pack_row(table, cols, row_data, record);
@@ -2399,7 +2404,7 @@
   error= likely(ev != 0) ? ev->add_row_data(row_data,len) : HA_ERR_OUT_OF_MEM ;
 
   if (table->write_row_record == 0)
-    my_free(row_data, MYF(MY_WME));
+    my_free((gptr) row_data, MYF(MY_WME));
 
   return error;
 }
Thread
bk commit into 5.1 tree (pkarthick:1.2056)pkarthick16 Jan