List:Commits« Previous MessageNext Message »
From:msvensson Date:January 10 2006 1:55pm
Subject:bk commit into 5.0 tree (msvensson:1.2027)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2027 06/01/10 14:55:39 msvensson@neptunus.(none) +1 -0
  Fix mysqltest crash problem

  client/mysqltest.c
    1.192 06/01/10 14:55:33 msvensson@neptunus.(none) +5 -3
    Revert to original version of copying name and value into var in var_init

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/wl2930/my50-wl2930-integration

--- 1.191/client/mysqltest.c	2006-01-09 18:16:51 +01:00
+++ 1.192/client/mysqltest.c	2006-01-10 14:55:33 +01:00
@@ -4216,10 +4216,12 @@
   if (!(tmp_var->str_val = my_malloc(val_alloc_len+1, MYF(MY_WME))))
     die("Out of memory");
 
-  if (name)
-    strmake(tmp_var->name, name, name_len);
+  memcpy(tmp_var->name, name, name_len);
   if (val)
-    strmake(tmp_var->str_val, val, val_len);
+  {
+    memcpy(tmp_var->str_val, val, val_len);
+    tmp_var->str_val[val_len]= 0;
+  }
   tmp_var->name_len = name_len;
   tmp_var->str_val_len = val_len;
   tmp_var->alloced_len = val_alloc_len;
Thread
bk commit into 5.0 tree (msvensson:1.2027)msvensson10 Jan