Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-06-20 21:33:53+04:00, evgen@stripped +8 -0
Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
When innodb detects a deadlock it calls ha_rollback_trans() to rollback the
main transaction. But such action isn't allowed from inside of triggers and
functions. When it happen the 'Explicit or implicit commit' error is thrown
even if there is no commit/rollback statements in the trigger/function. This
leads to the user confusion.
Now the convert_error_code_to_mysql() function doesn't call the
ha_rollback_trans() function directly but rather returns an error
and sets the thd->transaction_rollback_request and the
thd->is_fatal_sub_stmt_error flags.
The sp_rcontext::find_handler() now doesn't allow errors to be caught by the
trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag
is set.
The transaction_rollback_request and the is_fatal_sub_stmt_error flags are
added to the THD class. The are initialized by the THD class constructor.
The function now resets
The is_fatal_sub_stmt_error flag is reset by the reset_sub_statement_state
function and the transaction_rollback_request - by the
mysql_reset_thd_for_next_command and the ha_autocommit_or_rollback functions.
Now the ha_autocommit_or_rollback function rolls back main transaction
when not in a sub statement and the thd->transaction_rollback_request
is set.
mysql-test/r/innodb_mysql.result@stripped, 2007-06-20 19:48:35+04:00, evgen@stripped +33 -2
Added a test case for the bug#24989: The DEADLOCK error is improperly handled by InnoDB.
mysql-test/t/innodb_mysql.test@stripped, 2007-06-20 19:48:33+04:00, evgen@stripped +48 -0
Added a test case for the bug#24989: The DEADLOCK error is improperly handled by InnoDB.
sql/ha_innodb.cc@stripped, 2007-06-20 21:24:53+04:00, evgen@stripped +18 -23
Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
Now the convert_error_code_to_mysql() function doesn't call the
ha_rollback_trans() function directly but rather returns an error
and sets the thd->transaction_rollback_request and the
thd->is_fatal_sub_stmt_error flags.
sql/handler.cc@stripped, 2007-06-20 21:23:12+04:00, evgen@stripped +5 -0
Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
Now the ha_autocommit_or_rollback function rolls back main transaction
when not in a sub statement and the thd->transaction_rollback_request
is set.
sql/sp_rcontext.cc@stripped, 2007-06-20 21:32:51+04:00, evgen@stripped +3 -0
Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
The sp_rcontext::find_handler() now doesn't allow errors to be caught by the
trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag
is set.
sql/sql_class.cc@stripped, 2007-06-20 21:19:30+04:00, evgen@stripped +2 -0
Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
Initialization of the transaction_rollback_request and the is_fatal_sub_stmt_error
flags are added to the THD class constructor.
The reset_sub_statement_state function now resets the is_fatal_sub_stmt_error
flag.
sql/sql_class.h@stripped, 2007-06-20 19:51:24+04:00, evgen@stripped +2 -1
Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
The transaction_rollback_request and the is_fatal_sub_stmt_error flags are
added to the THD class.
sql/sql_parse.cc@stripped, 2007-06-20 21:33:11+04:00, evgen@stripped +1 -0
Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
Now the mysql_reset_thd_for_next_command function resets the
THD::transaction_rollback_request flag.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: evgen
# Host: moonbone.local
# Root: /mnt/gentoo64/work/24989-bug-5.0-opt-mysql
--- 1.233/sql/handler.cc 2007-05-07 23:12:13 +04:00
+++ 1.234/sql/handler.cc 2007-06-20 21:23:12 +04:00
@@ -858,6 +858,11 @@ int ha_autocommit_or_rollback(THD *thd,
if (ha_commit_stmt(thd))
error=1;
}
+ else if (thd->transaction_rollback_request && !thd->in_sub_stmt)
+ {
+ (void) ha_rollback(thd);
+ thd->transaction_rollback_request= FALSE;
+ }
else
(void) ha_rollback_stmt(thd);
--- 1.270/sql/sql_class.cc 2007-04-24 19:25:50 +04:00
+++ 1.271/sql/sql_class.cc 2007-06-20 21:19:30 +04:00
@@ -173,6 +173,7 @@ THD::THD()
Open_tables_state(refresh_version),
lock_id(&main_lock_id),
user_time(0), in_sub_stmt(0), global_read_lock(0), is_fatal_error(0),
+ transaction_rollback_request(0), is_fatal_sub_stmt_error(0),
rand_used(0), time_zone_used(0),
last_insert_id_used(0), last_insert_id_used_bin_log(0), insert_id_used(0),
clear_next_insert_id(0), in_lock_tables(0), bootstrap(0),
@@ -2114,6 +2115,7 @@ void THD::reset_sub_statement_state(Sub_
sent_row_count= 0;
cuted_fields= 0;
transaction.savepoints= 0;
+ is_fatal_sub_stmt_error= FALSE;
/* Surpress OK packets in case if we will execute statements */
net.no_send_ok= TRUE;
--- 1.331/sql/sql_class.h 2007-05-15 13:56:04 +04:00
+++ 1.332/sql/sql_class.h 2007-06-20 19:51:24 +04:00
@@ -1406,7 +1406,8 @@ public:
bool slave_thread, one_shot_set;
bool locked, some_tables_deleted;
bool last_cuted_field;
- bool no_errors, password, is_fatal_error;
+ bool no_errors, password, is_fatal_error, transaction_rollback_request;
+ bool is_fatal_sub_stmt_error;
bool query_start_used, rand_used, time_zone_used;
/*
--- 1.621/sql/sql_parse.cc 2007-05-15 13:56:04 +04:00
+++ 1.622/sql/sql_parse.cc 2007-06-20 21:33:11 +04:00
@@ -5812,6 +5812,7 @@ void mysql_reset_thd_for_next_command(TH
thd->query_start_used= thd->insert_id_used=0;
thd->last_insert_id_used_bin_log= FALSE;
thd->is_fatal_error= thd->time_zone_used= 0;
+ thd->transaction_rollback_request= FALSE;
thd->server_status&= ~ (SERVER_MORE_RESULTS_EXISTS |
SERVER_QUERY_NO_INDEX_USED |
SERVER_QUERY_NO_GOOD_INDEX_USED);
--- 1.21/mysql-test/r/innodb_mysql.result 2007-05-16 00:10:55 +04:00
+++ 1.22/mysql-test/r/innodb_mysql.result 2007-06-20 19:48:35 +04:00
@@ -487,7 +487,6 @@ ERROR HY000: Lock wait timeout exceeded;
select * from t1;
a
1
-5
commit;
select * from t1;
a
@@ -498,7 +497,6 @@ select * from t1;
a
1
2
-5
drop table t1;
set @save_qcache_size=@@global.query_cache_size;
set @save_qcache_type=@@global.query_cache_type;
@@ -617,4 +615,37 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE st
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 range idx1,idx2 idx1 9 NULL 2 Using where; Using index
DROP TABLE t1,t2;
+CREATE TABLE t1 (f1 int NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t2 (f2 int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
+CREATE TRIGGER t1_bi before INSERT
+ON t1 FOR EACH ROW
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLSTATE '40001' SET @a:= 'deadlock';
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+INSERT INTO t2 (f2) VALUES (1);
+DELETE FROM t2 WHERE f2 = 1;
+END;|
+start transaction;
+select get_lock("lock24989",10);
+get_lock("lock24989",10)
+1
+insert into t1 values(1);
+start transaction;
+insert into t2 values(123);
+select get_lock("lock24989",10);
+get_lock("lock24989",10)
+0
+insert into t1 values(1);
+select release_lock("lock24989");
+release_lock("lock24989")
+1
+insert into t1 values(1);
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+select @a;
+@a
+NULL
+select * from t2;
+f2
+commit;
+drop table t1,t2;
End of 5.0 tests
--- 1.21/mysql-test/t/innodb_mysql.test 2007-05-16 00:10:55 +04:00
+++ 1.22/mysql-test/t/innodb_mysql.test 2007-06-20 19:48:33 +04:00
@@ -597,4 +597,52 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE st
DROP TABLE t1,t2;
+#
+# Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
+#
+CREATE TABLE t1 (f1 int NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t2 (f2 int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
+DELIMITER |;
+CREATE TRIGGER t1_bi before INSERT
+ ON t1 FOR EACH ROW
+BEGIN
+ DECLARE CONTINUE HANDLER FOR SQLSTATE '40001' SET @a:= 'deadlock';
+ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+ INSERT INTO t2 (f2) VALUES (1);
+ DELETE FROM t2 WHERE f2 = 1;
+END;|
+DELIMITER ;|
+
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+
+connection con1;
+start transaction;
+select get_lock("lock24989",10);
+insert into t1 values(1);
+
+connection con2;
+start transaction;
+insert into t2 values(123);
+select get_lock("lock24989",10);
+send insert into t1 values(1);
+
+connection con1;
+select release_lock("lock24989");
+insert into t1 values(1);
+
+connection con2;
+--error 1213
+reap;
+select @a;
+# check that the whole transaction was rolled back
+select * from t2;
+
+connection con1;
+commit;
+disconnect con1;
+disconnect con2;
+connection default;
+drop table t1,t2;
+
--echo End of 5.0 tests
--- 1.313/sql/ha_innodb.cc 2007-04-29 17:40:41 +04:00
+++ 1.314/sql/ha_innodb.cc 2007-06-20 21:24:53 +04:00
@@ -451,25 +451,22 @@ convert_error_code_to_mysql(
return(-1); /* unspecified error */
} else if (error == (int) DB_DEADLOCK) {
- /* Since we rolled back the whole transaction, we must
- tell it also to MySQL so that MySQL knows to empty the
- cached binlog for this transaction */
-
- if (thd) {
- ha_rollback(thd);
- }
+ if (thd)
+ {
+ if (thd->in_sub_stmt)
+ thd->is_fatal_sub_stmt_error= TRUE;
+ thd->transaction_rollback_request= TRUE;
+ }
return(HA_ERR_LOCK_DEADLOCK);
} else if (error == (int) DB_LOCK_WAIT_TIMEOUT) {
-
- /* Starting from 5.0.13, we let MySQL just roll back the
- latest SQL statement in a lock wait timeout. Previously, we
- rolled back the whole transaction. */
-
- if (thd && row_rollback_on_timeout) {
- ha_rollback(thd);
- }
+ if (thd)
+ {
+ if (thd->in_sub_stmt)
+ thd->is_fatal_sub_stmt_error= TRUE;
+ thd->transaction_rollback_request= TRUE;
+ }
return(HA_ERR_LOCK_WAIT_TIMEOUT);
@@ -517,14 +514,12 @@ convert_error_code_to_mysql(
return(HA_ERR_NO_SAVEPOINT);
} else if (error == (int) DB_LOCK_TABLE_FULL) {
- /* Since we rolled back the whole transaction, we must
- tell it also to MySQL so that MySQL knows to empty the
- cached binlog for this transaction */
-
- if (thd) {
- ha_rollback(thd);
- }
-
+ if (thd)
+ {
+ if (thd->in_sub_stmt)
+ thd->is_fatal_sub_stmt_error= TRUE;
+ thd->transaction_rollback_request= TRUE;
+ }
return(HA_ERR_LOCK_TABLE_FULL);
} else {
return(-1); // Unknown error
--- 1.44/sql/sp_rcontext.cc 2006-12-23 22:04:26 +03:00
+++ 1.45/sql/sp_rcontext.cc 2007-06-20 21:32:51 +04:00
@@ -196,6 +196,9 @@ sp_rcontext::find_handler(uint sql_errno
{
if (m_hfound >= 0)
return 1; // Already got one
+ /* Don't allow fatal sub statement errors to be caught */
+ if (current_thd->is_fatal_sub_stmt_error)
+ return FALSE;
const char *sqlstate= mysql_errno_to_sqlstate(sql_errno);
int i= m_hcount, found= -1;
