1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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


client/mysqltest.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2006-01-10 14:56:46 +01:00
commit 1380951d98
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysqltest.c
View File

@ -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)))) if (!(tmp_var->str_val = my_malloc(val_alloc_len+1, MYF(MY_WME))))
die("Out of memory"); die("Out of memory");
if (name) memcpy(tmp_var->name, name, name_len);
strmake(tmp_var->name, name, name_len);
if (val) 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->name_len = name_len;
tmp_var->str_val_len = val_len; tmp_var->str_val_len = val_len;
tmp_var->alloced_len = val_alloc_len; tmp_var->alloced_len = val_alloc_len;