Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
72d3676f
Commit
72d3676f
authored
Jun 21, 2019
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove workaround from MDEV-9409
parent
e9a692fe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
18 deletions
+5
-18
client/mysqltest.cc
client/mysqltest.cc
+1
-8
mysql-test/main/perror-win.result
mysql-test/main/perror-win.result
+3
-3
sql/mysqld.cc
sql/mysqld.cc
+1
-7
No files found.
client/mysqltest.cc
View file @
72d3676f
...
...
@@ -873,17 +873,10 @@ static char *my_fgets(char * s, int n, FILE * stream, int *len)
/*
Wrapper for popen().
On Windows, uses binary mode to workaround
C runtime bug mentioned in MDEV-9409
*/
static
FILE
*
my_popen
(
const
char
*
cmd
,
const
char
*
mode
)
{
FILE
*
f
=
popen
(
cmd
,
mode
);
#ifdef _WIN32
if
(
f
)
_setmode
(
fileno
(
f
),
O_BINARY
);
#endif
return
f
;
return
popen
(
cmd
,
mode
);
}
#ifdef EMBEDDED_LIBRARY
...
...
mysql-test/main/perror-win.result
View file @
72d3676f
MariaDB error code 150: Foreign key constraint is incorrectly formed
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
OS error code 23: Too many open files in system
Win32 error code 23: Data error (cyclic redundancy check).
Win32 error code 23: Data error (cyclic redundancy check).
MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
Win32 error code 1062: The service has not been started.
Win32 error code 1062: The service has not been started.
Illegal error code: 30000
sql/mysqld.cc
View file @
72d3676f
...
...
@@ -5728,17 +5728,11 @@ int mysqld_main(int argc, char **argv)
init_ssl
();
network_init
();
#ifdef _
_WIN__
#ifdef _
WIN32
if
(
!
opt_console
)
{
FreeConsole
();
// Remove window
}
if
(
fileno
(
stdin
)
>=
0
)
{
/* Disable CRLF translation (MDEV-9409). */
_setmode
(
fileno
(
stdin
),
O_BINARY
);
}
#endif
#ifdef WITH_WSREP
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment