1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge from 5.0-bt

This commit is contained in:
Staale Smedseng
2009-06-29 15:17:01 +02:00
parent 5e0c653f03
commit 19dfaa5824
40 changed files with 254 additions and 224 deletions

View File

@ -196,7 +196,7 @@ tilde_expand (string)
int result_size, result_index;
result_index = result_size = 0;
if (result = strchr (string, '~'))
if ((result = strchr (string, '~')))
result = (char *)xmalloc (result_size = (strlen (string) + 16));
else
result = (char *)xmalloc (result_size = (strlen (string) + 1));