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
23cab491
Commit
23cab491
authored
Nov 24, 2005
by
pem@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some post-merge cleaning, and made assert THD::store_globals() work at all times.
parent
eae8414d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
mysql-test/t/sp.test
mysql-test/t/sp.test
+2
-0
sql/mysqld.cc
sql/mysqld.cc
+4
-1
sql/sql_class.cc
sql/sql_class.cc
+1
-0
No files found.
mysql-test/t/sp.test
View file @
23cab491
...
...
@@ -4773,6 +4773,8 @@ drop procedure bug10100pv|
drop
procedure
bug10100pd
|
drop
procedure
bug10100pc
|
drop
view
v1
|
#
# BUG#13729: Stored procedures: packet error after exception handled
#
--
disable_warnings
...
...
sql/mysqld.cc
View file @
23cab491
...
...
@@ -1589,6 +1589,7 @@ void end_thread(THD *thd, bool put_in_cache)
wake_thread
--
;
thd
=
thread_cache
.
get
();
thd
->
real_id
=
pthread_self
();
thd
->
thread_stack
=
(
char
*
)
&
thd
;
(
void
)
thd
->
store_globals
();
thd
->
thr_create_time
=
time
(
NULL
);
threads
.
append
(
thd
);
...
...
@@ -6912,8 +6913,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case
OPT_MYISAM_STATS_METHOD
:
{
ulong
method_conv
;
myisam_stats_method_str
=
argument
;
int
method
;
LINT_INIT
(
method_conv
);
myisam_stats_method_str
=
argument
;
if
((
method
=
find_type
(
argument
,
&
myisam_stats_method_typelib
,
2
))
<=
0
)
{
fprintf
(
stderr
,
"Invalid value of myisam_stats_method: %s.
\n
"
,
argument
);
...
...
sql/sql_class.cc
View file @
23cab491
...
...
@@ -183,6 +183,7 @@ THD::THD()
spcont
(
NULL
)
{
stmt_arena
=
this
;
thread_stack
=
0
;
db
=
0
;
catalog
=
(
char
*
)
"std"
;
// the only catalog we have for now
main_security_ctx
.
init
();
...
...
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