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
bcbdf5d6
Commit
bcbdf5d6
authored
Jul 11, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix signal_demo3.test: fix a typo in the merge, and update results to match 5.6
parent
7f5d138a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
mysql-test/r/signal_demo3.result
mysql-test/r/signal_demo3.result
+10
-10
sql/sql_signal.cc
sql/sql_signal.cc
+1
-1
No files found.
mysql-test/r/signal_demo3.result
View file @
bcbdf5d6
...
@@ -77,7 +77,7 @@ call proc_1();
...
@@ -77,7 +77,7 @@ call proc_1();
ERROR 45000: Oops in proc_1
ERROR 45000: Oops in proc_1
show warnings;
show warnings;
Level Code Message
Level Code Message
Error 1051 Unknown table 'oops_it_is_not_here'
Error 1051 Unknown table '
demo.
oops_it_is_not_here'
Error 1644 Oops in proc_9
Error 1644 Oops in proc_9
Error 1644 Oops in proc_8
Error 1644 Oops in proc_8
Error 1644 Oops in proc_7
Error 1644 Oops in proc_7
...
@@ -95,11 +95,11 @@ call proc_1();
...
@@ -95,11 +95,11 @@ call proc_1();
ERROR 45000: Oops in proc_1
ERROR 45000: Oops in proc_1
show warnings;
show warnings;
Level Code Message
Level Code Message
Error 1
051 Unknown table 'oops_it_is_not_here'
Error 1
644 Oops in proc_5
Error 1644 Oops in proc_
9
Error 1644 Oops in proc_
4
Error 1644 Oops in proc_
8
Error 1644 Oops in proc_
3
Error 1644 Oops in proc_
7
Error 1644 Oops in proc_
2
Error 1644 Oops in proc_
6
Error 1644 Oops in proc_
1
SET @@session.max_error_count = 7;
SET @@session.max_error_count = 7;
SELECT @@session.max_error_count;
SELECT @@session.max_error_count;
@@session.max_error_count
@@session.max_error_count
...
@@ -108,13 +108,13 @@ call proc_1();
...
@@ -108,13 +108,13 @@ call proc_1();
ERROR 45000: Oops in proc_1
ERROR 45000: Oops in proc_1
show warnings;
show warnings;
Level Code Message
Level Code Message
Error 1051 Unknown table 'oops_it_is_not_here'
Error 1644 Oops in proc_9
Error 1644 Oops in proc_8
Error 1644 Oops in proc_7
Error 1644 Oops in proc_7
Error 1644 Oops in proc_6
Error 1644 Oops in proc_6
Error 1644 Oops in proc_5
Error 1644 Oops in proc_5
Error 1644 Oops in proc_4
Error 1644 Oops in proc_4
Error 1644 Oops in proc_3
Error 1644 Oops in proc_2
Error 1644 Oops in proc_1
SET @@session.max_error_count = 9;
SET @@session.max_error_count = 9;
SELECT @@session.max_error_count;
SELECT @@session.max_error_count;
@@session.max_error_count
@@session.max_error_count
...
@@ -123,7 +123,6 @@ call proc_1();
...
@@ -123,7 +123,6 @@ call proc_1();
ERROR 45000: Oops in proc_1
ERROR 45000: Oops in proc_1
show warnings;
show warnings;
Level Code Message
Level Code Message
Error 1051 Unknown table 'oops_it_is_not_here'
Error 1644 Oops in proc_9
Error 1644 Oops in proc_9
Error 1644 Oops in proc_8
Error 1644 Oops in proc_8
Error 1644 Oops in proc_7
Error 1644 Oops in proc_7
...
@@ -132,6 +131,7 @@ Error 1644 Oops in proc_5
...
@@ -132,6 +131,7 @@ Error 1644 Oops in proc_5
Error 1644 Oops in proc_4
Error 1644 Oops in proc_4
Error 1644 Oops in proc_3
Error 1644 Oops in proc_3
Error 1644 Oops in proc_2
Error 1644 Oops in proc_2
Error 1644 Oops in proc_1
drop database demo;
drop database demo;
SET @@global.max_error_count = @start_global_value;
SET @@global.max_error_count = @start_global_value;
SELECT @@global.max_error_count;
SELECT @@global.max_error_count;
...
...
sql/sql_signal.cc
View file @
bcbdf5d6
...
@@ -510,7 +510,7 @@ bool Sql_cmd_resignal::execute(THD *thd)
...
@@ -510,7 +510,7 @@ bool Sql_cmd_resignal::execute(THD *thd)
signaled
->
level
,
signaled
->
level
,
signaled
->
message
);
signaled
->
message
);
if
(
m_cond
==
NULL
)
if
(
m_cond
)
{
{
query_cache_abort
(
&
thd
->
query_cache_tls
);
query_cache_abort
(
&
thd
->
query_cache_tls
);
...
...
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