mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  mysql.com:/home/dlenev/src/mysql-5.0-is
This commit is contained in:
dlenev@mysql.com 2005-08-09 12:57:50 +04:00
commit 82fb0beb9e
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/heap.result
View file

@ -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;

1
mysql-test/t/heap.test
View file

@ -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;

15
sql/ha_innodb.cc
View file

@ -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);