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
05f61ba4
Commit
05f61ba4
authored
Aug 16, 2016
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0
fix for async operations
parent
df09d5e7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
sql-common/client.c
sql-common/client.c
+2
-1
sql-common/mysql_async.c
sql-common/mysql_async.c
+5
-1
tests/mysql_client_test.c
tests/mysql_client_test.c
+3
-3
No files found.
sql-common/client.c
View file @
05f61ba4
...
...
@@ -3644,7 +3644,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
/* Free alloced memory */
end_server
(
mysql
);
mysql_close_free
(
mysql
);
if
(
!
(
client_flag
&
CLIENT_REMEMBER_OPTIONS
))
if
(
!
(
client_flag
&
CLIENT_REMEMBER_OPTIONS
)
&&
!
mysql
->
options
.
extension
->
async_context
)
mysql_close_free_options
(
mysql
);
}
DBUG_RETURN
(
0
);
...
...
sql-common/mysql_async.c
View file @
05f61ba4
...
...
@@ -455,7 +455,11 @@ MK_ASYNC_START_BODY(
parms
.
db
=
db
;
parms
.
port
=
port
;
parms
.
unix_socket
=
unix_socket
;
parms
.
client_flags
=
client_flags
;
/*
async wrapper enforce the CLIENT_REMEMBER_OPTIONS flag to be
functional (otherwise it can't operate)
*/
parms
.
client_flags
=
client_flags
|
CLIENT_REMEMBER_OPTIONS
;
},
NULL
,
r_ptr
,
...
...
tests/mysql_client_test.c
View file @
05f61ba4
...
...
@@ -18443,7 +18443,7 @@ static void test_bug58036()
if
(
mysql_real_connect
(
conn
,
opt_host
,
opt_user
,
opt_password
,
opt_db
?
opt_db
:
"test"
,
opt_port
,
opt_unix_socket
,
CLIENT_REMEMBER_OPTIONS
))
opt_port
,
opt_unix_socket
,
0
))
{
if
(
!
opt_silent
)
printf
(
"mysql_real_connect() succeeded (failure expected)
\n
"
);
...
...
@@ -18469,7 +18469,7 @@ static void test_bug58036()
mysql_options
(
conn
,
MYSQL_SET_CHARSET_NAME
,
"latin1"
);
if
(
!
mysql_real_connect
(
conn
,
opt_host
,
opt_user
,
opt_password
,
opt_db
?
opt_db
:
"test"
,
opt_port
,
opt_unix_socket
,
CLIENT_REMEMBER_OPTIONS
))
opt_port
,
opt_unix_socket
,
0
))
{
if
(
!
opt_silent
)
printf
(
"mysql_real_connect() failed: %s (%d)
\n
"
,
...
...
@@ -19344,7 +19344,7 @@ static void test_big_packet()
if
(
!
(
mysql_real_connect
(
mysql_local
,
opt_host
,
opt_user
,
opt_password
,
current_db
,
opt_port
,
opt_unix_socket
,
CLIENT_REMEMBER_OPTIONS
)))
opt_unix_socket
,
0
)))
{
mysql_close
(
mysql_local
);
fprintf
(
stderr
,
"
\n
connection failed(%s)"
,
mysql_error
(
mysql_local
));
...
...
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