diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-12-01 21:07:18 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-12-01 21:07:18 +0200 |
| commit | 0eda48463ce9c60408515819f9d954fd48567d4f (patch) | |
| tree | 39a60b9bbefbde5c02b040d381c8fd5d0c0dc0ea /mysql-test/r/signal_code.result | |
| parent | 3c11750e363da6e1017d5bc86e9e7e03b2c4e101 (diff) | |
| parent | 80cb81069b43978da39ad99cf7d23fc52deb95d6 (diff) | |
| download | mariadb-git-0eda48463ce9c60408515819f9d954fd48567d4f.tar.gz | |
Manual resolving for the following files
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).
Diffstat (limited to 'mysql-test/r/signal_code.result')
| -rw-r--r-- | mysql-test/r/signal_code.result | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/signal_code.result b/mysql-test/r/signal_code.result index 8cda8877216..2ecba4701fa 100644 --- a/mysql-test/r/signal_code.result +++ b/mysql-test/r/signal_code.result @@ -20,16 +20,16 @@ return 0; end $$ show procedure code signal_proc; Pos Instruction -0 stmt 135 "SIGNAL foo" -1 stmt 135 "SIGNAL foo SET MESSAGE_TEXT = "This i..." -2 stmt 136 "RESIGNAL foo" -3 stmt 136 "RESIGNAL foo SET MESSAGE_TEXT = "This..." +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 135 "SIGNAL foo" -1 stmt 135 "SIGNAL foo SET MESSAGE_TEXT = "This i..." -2 stmt 136 "RESIGNAL foo" -3 stmt 136 "RESIGNAL foo SET MESSAGE_TEXT = "This..." +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; |