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
0ddefa60
Commit
0ddefa60
authored
15 years ago
by
Davi Arnaut
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fix for Bug#43587: Handle failures to execute a statement
during bootstrap on a embedded server.
parent
4fe66512
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+12
-2
No files found.
libmysqld/lib_sql.cc
View file @
0ddefa60
...
...
@@ -1078,9 +1078,19 @@ net_send_eof(THD *thd, uint server_status, uint total_warn_count)
void
net_send_error_packet
(
THD
*
thd
,
uint
sql_errno
,
const
char
*
err
)
{
MYSQL_DATA
*
data
=
thd
->
cur_data
?
thd
->
cur_data
:
thd
->
alloc_new_dataset
();
struct
embedded_query_result
*
ei
=
data
->
embedded_info
;
MYSQL_DATA
*
data
=
thd
->
cur_data
;
struct
embedded_query_result
*
ei
;
if
(
!
thd
->
mysql
)
// bootstrap file handling
{
fprintf
(
stderr
,
"ERROR: %d %s
\n
"
,
sql_errno
,
err
);
return
;
}
if
(
!
data
)
data
=
thd
->
alloc_new_dataset
();
ei
=
data
->
embedded_info
;
ei
->
last_errno
=
sql_errno
;
strmake
(
ei
->
info
,
err
,
sizeof
(
ei
->
info
)
-
1
);
strmov
(
ei
->
sqlstate
,
mysql_errno_to_sqlstate
(
sql_errno
));
...
...
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