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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
90bd948e
Commit
90bd948e
authored
21 years ago
by
hf@deer.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for #1219
parent
cf0c41aa
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+9
-7
No files found.
libmysqld/lib_sql.cc
View file @
90bd948e
...
...
@@ -37,6 +37,7 @@ char server_inited;
C_MODE_START
#include <mysql.h>
#undef ER
#include "errmsg.h"
#include <sql_common.h>
...
...
@@ -55,12 +56,13 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
{
my_bool
result
=
1
;
THD
*
thd
=
(
THD
*
)
mysql
->
thd
;
NET
*
net
=
&
mysql
->
net
;
/* Check that we are calling the client functions in right order */
if
(
mysql
->
status
!=
MYSQL_STATUS_READY
)
{
strmov
(
thd
->
net
.
last_error
,
ER
(
thd
->
net
.
last_errno
=
CR_COMMANDS_OUT_OF_SYNC
));
strmov
(
net
->
last_error
,
ER
(
net
->
last_errno
=
CR_COMMANDS_OUT_OF_SYNC
));
return
1
;
}
...
...
@@ -76,12 +78,12 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
if
(
!
skip_check
)
result
=
thd
->
net
.
last_errno
?
-
1
:
0
;
if
((
mysql
->
net
.
last_errno
=
thd
->
net
.
last_errno
))
if
((
net
->
last_errno
=
thd
->
net
.
last_errno
))
{
memcpy
(
mysql
->
net
.
last_error
,
thd
->
net
.
last_error
,
sizeof
(
mysql
->
net
.
last_error
));
memcpy
(
mysql
->
net
.
sqlstate
,
thd
->
net
.
sqlstate
,
sizeof
(
mysql
->
net
.
sqlstate
));
memcpy
(
net
->
last_error
,
net
->
last_error
,
sizeof
(
net
->
last_error
));
memcpy
(
net
->
sqlstate
,
thd
->
net
.
sqlstate
,
sizeof
(
net
->
sqlstate
));
}
mysql
->
warning_count
=
((
THD
*
)
mysql
->
thd
)
->
total_warn_count
;
return
result
;
...
...
This diff is collapsed.
Click to expand it.
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