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

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
This commit is contained in:
cmiller@zippy.cornsilk.net
2006-08-25 14:34:17 -04:00
8 changed files with 40 additions and 33 deletions

View File

@ -14968,7 +14968,7 @@ static void test_bug17667()
strcpy(master_log_filename, opt_vardir);
strcat(master_log_filename, "/log/master.log");
printf("Opening '%s'\n", master_log_filename);
log_file= fopen(master_log_filename, "r");
log_file= my_fopen(master_log_filename, (int) (O_RDONLY | O_BINARY), MYF(MY_WME));
free(master_log_filename);
if (log_file != NULL) {
@ -14993,6 +14993,8 @@ static void test_bug17667()
DIE("Read error");
}
}
/* Print the line */
printf("%s", line_buffer);
} while (my_memmem(line_buffer, MAX_TEST_QUERY_LENGTH*2,
statement_cursor->buffer, statement_cursor->length) == NULL);
@ -15013,7 +15015,7 @@ static void test_bug17667()
}
if (log_file != NULL)
fclose(log_file);
my_fclose(log_file, MYF(0));
}