Commit 1380951d authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration 

into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 05554137 a89284ba

client/mysqltest.c

+5 −3
Original line number Diff line number Diff line
@@ -4216,10 +4216,12 @@ static VAR *var_init(VAR *v, const char *name, int name_len, const char *val, 
  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;