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
27ee6db9
Commit
27ee6db9
authored
Oct 09, 2007
by
anozdrin/alik@station
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge.
parent
1d63cac0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
sql/mysql_priv.h
sql/mysql_priv.h
+1
-0
sql/sql_connect.cc
sql/sql_connect.cc
+12
-4
sql/sql_parse.cc
sql/sql_parse.cc
+0
-2
No files found.
sql/mysql_priv.h
View file @
27ee6db9
...
...
@@ -965,6 +965,7 @@ void init_update_queries(void);
void
free_max_user_conn
(
void
);
pthread_handler_t
handle_bootstrap
(
void
*
arg
);
bool
mysql_execute_command
(
THD
*
thd
);
bool
do_command
(
THD
*
thd
);
bool
dispatch_command
(
enum
enum_server_command
command
,
THD
*
thd
,
char
*
packet
,
uint
packet_length
);
void
log_slow_statement
(
THD
*
thd
);
...
...
sql/sql_connect.cc
View file @
27ee6db9
...
...
@@ -973,21 +973,29 @@ void end_connection(THD *thd)
plugin_thdvar_cleanup
(
thd
);
if
(
thd
->
user_connect
)
decrease_user_connections
(
thd
->
user_connect
);
if
(
thd
->
killed
||
net
->
error
&&
net
->
vio
!=
0
&&
net
->
report_error
)
{
statistic_increment
(
aborted_threads
,
&
LOCK_status
);
}
if
(
net
->
error
&&
net
->
vio
!=
0
&&
net
->
report_error
)
{
Security_context
*
sctx
=
thd
->
security_ctx
;
if
(
!
thd
->
killed
&&
thd
->
variables
.
log_warnings
>
1
)
{
Security_context
*
sctx
=
thd
->
security_ctx
;
sql_print_warning
(
ER
(
ER_NEW_ABORTING_CONNECTION
),
thd
->
thread_id
,(
thd
->
db
?
thd
->
db
:
"unconnected"
),
sctx
->
user
?
sctx
->
user
:
"unauthenticated"
,
sctx
->
host_or_ip
,
(
net
->
last_errno
?
ER
(
net
->
last_errno
)
:
ER
(
ER_UNKNOWN_ERROR
)));
}
net_send_error
(
thd
,
net
->
last_errno
,
NullS
);
statistic_increment
(
aborted_threads
,
&
LOCK_status
);
}
else
if
(
thd
->
killed
)
statistic_increment
(
aborted_threads
,
&
LOCK_status
);
}
...
...
sql/sql_parse.cc
View file @
27ee6db9
...
...
@@ -86,8 +86,6 @@ const char *xa_state_names[]={
"NON-EXISTING"
,
"ACTIVE"
,
"IDLE"
,
"PREPARED"
};
static
bool
do_command
(
THD
*
thd
);
static
void
unlock_locked_tables
(
THD
*
thd
)
{
if
(
thd
->
locked_tables
)
...
...
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