diff options
| author | monty@mashka.mysql.fi <> | 2003-01-16 20:47:46 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-16 20:47:46 +0200 |
| commit | f4b950df960a96a06b4a97fe1f4cee22e52e7d5d (patch) | |
| tree | e1fdb60db4adfe4fafddb5d063b62fbb7cff6326 /client | |
| parent | c16e908a2bb32c4ae945b0d0856a92ae309c8514 (diff) | |
| parent | 6250c1d974877fc1a678c3438fc9cc5b95222089 (diff) | |
| download | mariadb-git-f4b950df960a96a06b4a97fe1f4cee22e52e7d5d.tar.gz | |
Merge with 3.23
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index fe99dda1ac3..9e411e5f28f 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -42,7 +42,7 @@ **********************************************************************/ -#define MTEST_VERSION "1.26" +#define MTEST_VERSION "1.27" #include <my_global.h> #include <mysql_embed.h> @@ -677,7 +677,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, MYF(MY_WME)))) + if (!(*(cur_file+1) = my_fopen(buff, O_RDONLY | O_BINARY, MYF(MY_WME)))) die(NullS); cur_file++; *++lineno=1; @@ -1912,7 +1912,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, MYF(MY_WME)))) + if (!(*++cur_file = my_fopen(buff, O_RDONLY | O_BINARY, MYF(MY_WME)))) die("Could not open %s: errno = %d", argument, errno); break; } |