diff options
| -rw-r--r-- | mysql-test/r/heap.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/heap.test | 1 | ||||
| -rw-r--r-- | sql/ha_innodb.cc | 15 |
3 files changed, 9 insertions, 11 deletions
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result index 4725ff6b814..969cb06e9fe 100644 --- a/mysql-test/r/heap.result +++ b/mysql-test/r/heap.result @@ -705,6 +705,6 @@ create table t1 (c char(10)) engine=memory; create table t2 (c varchar(10)) engine=memory; show table status like 't_'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 MEMORY 10 Fixed 0 11 0 720192 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL -t2 MEMORY 10 Fixed 0 12 0 785664 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t1 MEMORY 10 Fixed 0 11 0 # 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t2 MEMORY 10 Fixed 0 12 0 # 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL drop table t1, t2; diff --git a/mysql-test/t/heap.test b/mysql-test/t/heap.test index 922bd4b9bf0..fcaa4c41ece 100644 --- a/mysql-test/t/heap.test +++ b/mysql-test/t/heap.test @@ -443,6 +443,7 @@ drop table t1; # create table t1 (c char(10)) engine=memory; create table t2 (c varchar(10)) engine=memory; +--replace_column 8 # show table status like 't_'; drop table t1, t2; diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index d5d79b51f60..d98222975c5 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2146,15 +2146,12 @@ innobase_close_connection( ut_a(trx); - if (trx->conc_state != TRX_NOT_STARTED) { - ut_print_timestamp(stderr); - - fprintf(stderr, -" InnoDB: Warning: MySQL is closing a connection\n" -"InnoDB: that has an active InnoDB transaction. We roll back that\n" -"InnoDB: transaction. %lu row modifications to roll back.\n", - (ulong)trx->undo_no.low); - } + if (trx->conc_state != TRX_NOT_STARTED && + global_system_variables.log_warnings) + sql_print_warning("MySQL is closing a connection that has an active " + "InnoDB transaction. %lu row modifications will " + "roll back.", + (ulong)trx->undo_no.low); innobase_rollback_trx(trx); |