diff options
| author | konstantin@mysql.com <> | 2005-08-10 18:36:13 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-08-10 18:36:13 +0400 |
| commit | 8392a814af9c80c7c6b8c1a4819b278e43a7e93d (patch) | |
| tree | 456848ab2f200b91bb21ed69d717cf36187eabdc /sql | |
| parent | cacc1a9f0a0af6901b39fb1a4a52633521027bc4 (diff) | |
| download | mariadb-git-8392a814af9c80c7c6b8c1a4819b278e43a7e93d.tar.gz | |
A fix and a test case for Bug#12243 "MySQL Server crashes with 2
cursors (+ commit)" and Bug#11832 "Server crash with InnoDB + Cursors"
See comments to the changed files.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 026bc0da13d..0a01c08c916 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2146,6 +2146,15 @@ innobase_close_connection( ut_a(trx); + if (trx->active_trans == 0 + && trx->conc_state != TRX_NOT_STARTED) { + + fprintf(stderr, +"InnoDB: Error: trx->active_trans == 0\n" +"InnoDB: but trx->conc_state != TRX_NOT_STARTED\n"); + } + + if (trx->conc_state != TRX_NOT_STARTED && global_system_variables.log_warnings) sql_print_warning("MySQL is closing a connection that has an active " |