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
5a09edd2
Commit
5a09edd2
authored
Oct 30, 2007
by
kostja@bodhi.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failing init_connect.test (5.1-runtime).
parent
47c381fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
sql/sql_connect.cc
sql/sql_connect.cc
+11
-1
No files found.
sql/sql_connect.cc
View file @
5a09edd2
...
@@ -1030,7 +1030,17 @@ static void prepare_new_connection_state(THD* thd)
...
@@ -1030,7 +1030,17 @@ static void prepare_new_connection_state(THD* thd)
if
(
sys_init_connect
.
value_length
&&
!
(
sctx
->
master_access
&
SUPER_ACL
))
if
(
sys_init_connect
.
value_length
&&
!
(
sctx
->
master_access
&
SUPER_ACL
))
{
{
execute_init_command
(
thd
,
&
sys_init_connect
,
&
LOCK_sys_init_connect
);
execute_init_command
(
thd
,
&
sys_init_connect
,
&
LOCK_sys_init_connect
);
if
(
thd
->
net
.
report_error
)
/*
execute_init_command calls net_send_error.
If there was an error during execution of the init statements,
the error at this moment is present in thd->net.last_error and also
thd->is_slave_error and thd->net.report_error are set.
net_send_error sends the contents of thd->net.last_error and
clears thd->net.report_error. It doesn't, however, clean
thd->is_slave_error or thd->net.last_error. Here we make use of this
fact.
*/
if
(
thd
->
is_slave_error
)
{
{
thd
->
killed
=
THD
::
KILL_CONNECTION
;
thd
->
killed
=
THD
::
KILL_CONNECTION
;
sql_print_warning
(
ER
(
ER_NEW_ABORTING_CONNECTION
),
sql_print_warning
(
ER
(
ER_NEW_ABORTING_CONNECTION
),
...
...
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