mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Added O_BINARY flag to all my_fopen() calls.
(To make the current tests results work on windows)
This commit is contained in:
@@ -43,7 +43,7 @@
|
|||||||
|
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
#define MTEST_VERSION "1.10"
|
#define MTEST_VERSION "1.11"
|
||||||
|
|
||||||
#include <global.h>
|
#include <global.h>
|
||||||
#include <my_sys.h>
|
#include <my_sys.h>
|
||||||
@@ -573,7 +573,7 @@ int open_file(const char* name)
|
|||||||
{
|
{
|
||||||
if (*cur_file && cur_file == file_stack_end)
|
if (*cur_file && cur_file == file_stack_end)
|
||||||
die("Source directives are nesting too deep");
|
die("Source directives are nesting too deep");
|
||||||
if (!(*(cur_file+1) = my_fopen(name, O_RDONLY, MYF(MY_WME))))
|
if (!(*(cur_file+1) = my_fopen(name, O_RDONLY | O_BINARY, MYF(MY_WME))))
|
||||||
die(NullS);
|
die(NullS);
|
||||||
cur_file++;
|
cur_file++;
|
||||||
*++lineno=1;
|
*++lineno=1;
|
||||||
@@ -1589,7 +1589,7 @@ int parse_args(int argc, char **argv)
|
|||||||
result_file = optarg;
|
result_file = optarg;
|
||||||
break;
|
break;
|
||||||
case 'x':
|
case 'x':
|
||||||
if (!(*cur_file = my_fopen(optarg, O_RDONLY, MYF(MY_WME))))
|
if (!(*cur_file = my_fopen(optarg, O_RDONLY | O_BINARY, MYF(MY_WME))))
|
||||||
die("Could not open %s: errno = %d", optarg, errno);
|
die("Could not open %s: errno = %d", optarg, errno);
|
||||||
break;
|
break;
|
||||||
case 'p':
|
case 'p':
|
||||||
|
Reference in New Issue
Block a user