database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Backport kostja's fix for Bug#32724 "innodb_mysql.test fails randomly".

Browse Source 
Enable back the disabled test case.
This commit is contained in:
davi@mysql.com/endora.local
2008-04-29 00:03:19 -03:00
parent 584f23ee77
commit a454190f0d
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/mix1.inc
View File

@ -1309,6 +1309,7 @@ SELECT * FROM t1;
--echo # Switch to connection con2 --echo # Switch to connection con2
connection con2; connection con2;
--reap
SELECT * FROM t1; SELECT * FROM t1;
--echo # Switch to connection con1 --echo # Switch to connection con1

22
mysql-test/r/innodb_mysql.result
View File

@ -887,13 +887,13 @@ EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
id 1 id 1
select_type SIMPLE select_type SIMPLE
table t1 table t1
type index type range
possible_keys bkey possible_keys bkey
key PRIMARY key bkey
key_len 4 key_len 5
ref NULL ref NULL
rows 32 rows 16
Extra Using where Extra Using where; Using index; Using filesort
SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a; SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
a b a b
1 2 1 2
@ -982,13 +982,13 @@ EXPLAIN SELECT * FROM t2 WHERE b=1 ORDER BY a;
id 1 id 1
select_type SIMPLE select_type SIMPLE
table t2 table t2
type index type ref
possible_keys bkey possible_keys bkey
key PRIMARY key bkey
key_len 4 key_len 5
ref NULL ref const
rows 16 rows 8
Extra Using where; Using index Extra Using where; Using index; Using filesort
SELECT * FROM t2 WHERE b=1 ORDER BY a; SELECT * FROM t2 WHERE b=1 ORDER BY a;
a b c a b c
1 1 1 1 1 1

1
mysql-test/t/disabled.def
View File

@ -10,7 +10,6 @@
# #
############################################################################## ##############################################################################
federated_transactions : Bug#29523 Transactions do not work federated_transactions : Bug#29523 Transactions do not work
innodb_mysql : Bug#32724: innodb_mysql.test fails randomly
status : Bug#32966 main.status fails status : Bug#32966 main.status fails
ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166 ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables

1
sql/sql_parse.cc
View File

@ -3301,6 +3301,7 @@ end_with_restore_list:
can free its locks if LOCK TABLES locked some tables before finding can free its locks if LOCK TABLES locked some tables before finding
that it can't lock a table in its list that it can't lock a table in its list
*/ */
ha_autocommit_or_rollback(thd, 1);
end_active_trans(thd); end_active_trans(thd);
thd->options&= ~(OPTION_TABLE_LOCK); thd->options&= ~(OPTION_TABLE_LOCK);
} }