diff options
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index c938ec5eec0..f417018dbb7 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -684,7 +684,7 @@ int open_file(const char* name) if (*cur_file && cur_file == file_stack_end) die("Source directives are nesting too deep"); - if (!(*(cur_file+1) = my_fopen(buff, O_RDONLY | O_BINARY, MYF(MY_WME)))) + if (!(*(cur_file+1) = my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(MY_WME)))) die(NullS); cur_file++; *++lineno=1; @@ -692,18 +692,6 @@ int open_file(const char* name) return 0; } -static void my_sleep(ulong m_seconds) -{ -#ifndef OS2 - struct timeval t; - t.tv_sec= m_seconds / 1000000L; - t.tv_usec= m_seconds % 1000000L; - select(0,0,0,0,&t); /* sleep */ -#else - DosSleep(m_seconds/1000+1); -#endif -} - /* ugly long name, but we are following the convention */ int do_wait_for_slave_to_stop(struct st_query* q __attribute__((unused))) @@ -1925,7 +1913,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), argument= buff; } fn_format(buff, argument, "", "", 4); - if (!(*++cur_file = my_fopen(buff, O_RDONLY | O_BINARY, MYF(MY_WME)))) + if (!(*++cur_file = my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(MY_WME)))) die("Could not open %s: errno = %d", argument, errno); break; } @@ -2611,7 +2599,7 @@ static int read_server_arguments(const char* name) embedded_server_arg_count=1; embedded_server_args[0]= (char*) ""; /* Progname */ } - if (!(file=my_fopen(buff, O_RDONLY | O_BINARY, MYF(MY_WME)))) + if (!(file=my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(MY_WME)))) return 1; while (embedded_server_arg_count < MAX_SERVER_ARGS && (str=fgets(argument,sizeof(argument), file))) |