merging fix

This commit is contained in:
Alexey Botchkov 2008-08-26 13:32:43 +05:00
commit 8d3eb141e0
10 changed files with 58 additions and 6 deletions

View file

@ -7950,7 +7950,7 @@ C_MODE_START
int test_if_data_home_dir(const char *dir)
{
char path[FN_REFLEN];
uint dir_len;
int dir_len;
DBUG_ENTER("test_if_data_home_dir");
if (!dir)