mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
0eda48463c
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/r/show_check.result
Text conflict in mysql-test/r/sp-code.result
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/t/show_check.test
Text conflict in mysys/my_delete.c
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/log.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/repl_failsafe.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_yacc.yy
Text conflict in storage/myisam/ha_myisam.cc
Corrected results for
stm_auto_increment_bug33029.reject 2009-12-01
20:01:49.000000000 +0300
<andrei> @@ -42,9 +42,6 @@
<andrei> RETURN i;
<andrei> END//
<andrei> CALL p1();
<andrei> -Warnings:
<andrei> -Note 1592 Statement may not be safe to log in statement
format.
<andrei> -Note 1592 Statement may not be safe to log in statement
format.
There should be indeed no Note present because there is in fact autoincrement
top-level query in sp() that triggers inserting in yet another auto-inc table.
(todo: alert DaoGang to improve the test).
35 lines
1 KiB
Text
35 lines
1 KiB
Text
use test;
|
|
drop procedure if exists signal_proc;
|
|
drop function if exists signal_func;
|
|
create procedure signal_proc()
|
|
begin
|
|
DECLARE foo CONDITION FOR SQLSTATE '12345';
|
|
SIGNAL foo;
|
|
SIGNAL foo SET MESSAGE_TEXT = "This is an error message";
|
|
RESIGNAL foo;
|
|
RESIGNAL foo SET MESSAGE_TEXT = "This is an error message";
|
|
end $$
|
|
create function signal_func() returns int
|
|
begin
|
|
DECLARE foo CONDITION FOR SQLSTATE '12345';
|
|
SIGNAL foo;
|
|
SIGNAL foo SET MESSAGE_TEXT = "This is an error message";
|
|
RESIGNAL foo;
|
|
RESIGNAL foo SET MESSAGE_TEXT = "This is an error message";
|
|
return 0;
|
|
end $$
|
|
show procedure code signal_proc;
|
|
Pos Instruction
|
|
0 stmt 131 "SIGNAL foo"
|
|
1 stmt 131 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
|
|
2 stmt 132 "RESIGNAL foo"
|
|
3 stmt 132 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
|
|
drop procedure signal_proc;
|
|
show function code signal_func;
|
|
Pos Instruction
|
|
0 stmt 131 "SIGNAL foo"
|
|
1 stmt 131 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
|
|
2 stmt 132 "RESIGNAL foo"
|
|
3 stmt 132 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
|
|
4 freturn 3 0
|
|
drop function signal_func;
|