Commit 007125b3 authored by lenz@mysql.com's avatar lenz@mysql.com

Merge lgrimmer@bk-internal:/home/bk/mysql-5.1-new

into  mysql.com:/space/my/mysql-5.1
parents 183bf111 564ff2c7
...@@ -55,7 +55,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist) ...@@ -55,7 +55,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist)
length= cleanup_dirname(buff, buff); length= cleanup_dirname(buff, buff);
if (!(copy= my_strdup_with_length(buff, length, MYF(MY_WME))) || if (!(copy= my_strdup_with_length(buff, length, MYF(MY_WME))) ||
insert_dynamic(&t_arr, (gptr) &copy)) insert_dynamic(&t_arr, (gptr) &copy))
DBUG_RETURN(TRUE) DBUG_RETURN(TRUE);
pathlist=end+1; pathlist=end+1;
} }
while (*end); while (*end);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment