diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
| commit | d28d3ba40dc8ebef87199a2567ec96e9c5d744e2 (patch) | |
| tree | c6b9ab1d8193fa2a26c5e376d43e536abd3a47ce /sql/sql_handler.cc | |
| parent | ff485d2dc4d5adaf5eef0ccd03ce62adf3bd30b3 (diff) | |
| parent | 6bf10fac445d73fb796d4863612c87bff5f28b66 (diff) | |
| download | mariadb-git-d28d3ba40dc8ebef87199a2567ec96e9c5d744e2.tar.gz | |
10.0-base merge
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 4187327d622..812a5dc1461 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -791,7 +791,10 @@ retry: /* Always close statement transaction explicitly, so that the engine doesn't have to count locks. + There should be no need to perform transaction + rollback due to deadlock. */ + DBUG_ASSERT(! thd->transaction_rollback_request); trans_rollback_stmt(thd); mysql_ha_close_table(handler); if (thd->stmt_arena->is_stmt_execute()) |