Commit c4228519 authored by unknown's avatar unknown

Fixed test that failed on 32 bit systems


sql/ha_innodb.cc:
  Don't print not critical warning if log_warnings is not set
  Use sql_print_warning() instead of fprintf().
  (We should not use fprintf() as this causes problems on windows and with the embedded server)
parent 807a9c8d
...@@ -705,6 +705,6 @@ create table t1 (c char(10)) engine=memory; ...@@ -705,6 +705,6 @@ create table t1 (c char(10)) engine=memory;
create table t2 (c varchar(10)) engine=memory; create table t2 (c varchar(10)) engine=memory;
show table status like 't_'; 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 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 t1 MEMORY 10 Fixed 0 11 0 # 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 t2 MEMORY 10 Fixed 0 12 0 # 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL
drop table t1, t2; drop table t1, t2;
...@@ -443,6 +443,7 @@ drop table t1; ...@@ -443,6 +443,7 @@ drop table t1;
# #
create table t1 (c char(10)) engine=memory; create table t1 (c char(10)) engine=memory;
create table t2 (c varchar(10)) engine=memory; create table t2 (c varchar(10)) engine=memory;
--replace_column 8 #
show table status like 't_'; show table status like 't_';
drop table t1, t2; drop table t1, t2;
......
...@@ -2146,15 +2146,12 @@ innobase_close_connection( ...@@ -2146,15 +2146,12 @@ innobase_close_connection(
ut_a(trx); ut_a(trx);
if (trx->conc_state != TRX_NOT_STARTED) { if (trx->conc_state != TRX_NOT_STARTED &&
ut_print_timestamp(stderr); global_system_variables.log_warnings)
sql_print_warning("MySQL is closing a connection that has an active "
fprintf(stderr, "InnoDB transaction. %lu row modifications will "
" InnoDB: Warning: MySQL is closing a connection\n" "roll back.",
"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); (ulong)trx->undo_no.low);
}
innobase_rollback_trx(trx); innobase_rollback_trx(trx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment