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
fa353b8f
Commit
fa353b8f
authored
Jun 22, 2005
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change error message when the amount of stack needed is not available
to include how much stack space we need. (Bug #11213)
parent
30a0ad3a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
sql/share/errmsg.txt
sql/share/errmsg.txt
+2
-0
sql/sql_parse.cc
sql/sql_parse.cc
+3
-2
No files found.
sql/share/errmsg.txt
View file @
fa353b8f
...
@@ -5358,3 +5358,5 @@ ER_STMT_HAS_NO_OPEN_CURSOR
...
@@ -5358,3 +5358,5 @@ ER_STMT_HAS_NO_OPEN_CURSOR
eng "The statement (%lu) has no open cursor."
eng "The statement (%lu) has no open cursor."
ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
eng "Explicit or implicit commit is not allowed in stored function or trigger."
eng "Explicit or implicit commit is not allowed in stored function or trigger."
ER_STACK_OVERRUN_NEED_MORE
eng "Thread stack overrun: %ld bytes used of a %ld byte stack, and %ld bytes needed. Use 'mysqld -O thread_stack=#' to specify a bigger stack."
sql/sql_parse.cc
View file @
fa353b8f
...
@@ -5094,8 +5094,9 @@ bool check_stack_overrun(THD *thd, long margin,
...
@@ -5094,8 +5094,9 @@ bool check_stack_overrun(THD *thd, long margin,
if
((
stack_used
=
used_stack
(
thd
->
thread_stack
,(
char
*
)
&
stack_used
))
>=
if
((
stack_used
=
used_stack
(
thd
->
thread_stack
,(
char
*
)
&
stack_used
))
>=
(
long
)
(
thread_stack
-
margin
))
(
long
)
(
thread_stack
-
margin
))
{
{
sprintf
(
errbuff
[
0
],
ER
(
ER_STACK_OVERRUN
),
stack_used
,
thread_stack
);
sprintf
(
errbuff
[
0
],
ER
(
ER_STACK_OVERRUN_NEED_MORE
),
my_message
(
ER_STACK_OVERRUN
,
errbuff
[
0
],
MYF
(
0
));
stack_used
,
thread_stack
,
margin
);
my_message
(
ER_STACK_OVERRUN_NEED_MORE
,
errbuff
[
0
],
MYF
(
0
));
thd
->
fatal_error
();
thd
->
fatal_error
();
return
1
;
return
1
;
}
}
...
...
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