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
bb233cb3
Commit
bb233cb3
authored
Mar 15, 2007
by
dlenev@mockturtle.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg25966-2
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg25966
parents
d9d887ad
e4f88d52
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
0 deletions
+10
-0
sql/mysqld.cc
sql/mysqld.cc
+6
-0
sql/sp_head.cc
sql/sp_head.cc
+1
-0
sql/sql_parse.cc
sql/sql_parse.cc
+3
-0
No files found.
sql/mysqld.cc
View file @
bb233cb3
...
...
@@ -1804,6 +1804,12 @@ static bool cache_thread()
thd
=
thread_cache
.
get
();
thd
->
thread_stack
=
(
char
*
)
&
thd
;
// For store_globals
(
void
)
thd
->
store_globals
();
/*
THD::mysys_var::abort is associated with physical thread rather
than with THD object. So we need to reset this flag before using
this thread for handling of new THD object/connection.
*/
thd
->
mysys_var
->
abort
=
0
;
thd
->
thr_create_time
=
time
(
NULL
);
threads
.
append
(
thd
);
return
(
1
);
...
...
sql/sp_head.cc
View file @
bb233cb3
...
...
@@ -1127,6 +1127,7 @@ sp_head::execute(THD *thd)
thd
->
clear_error
();
thd
->
is_fatal_error
=
0
;
thd
->
killed
=
THD
::
NOT_KILLED
;
thd
->
mysys_var
->
abort
=
0
;
continue
;
}
}
...
...
sql/sql_parse.cc
View file @
bb233cb3
...
...
@@ -689,7 +689,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
DBUG_ENTER
(
"dispatch_command"
);
if
(
thd
->
killed
==
THD
::
KILL_QUERY
||
thd
->
killed
==
THD
::
KILL_BAD_DATA
)
{
thd
->
killed
=
THD
::
NOT_KILLED
;
thd
->
mysys_var
->
abort
=
0
;
}
thd
->
command
=
command
;
/*
...
...
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