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

Merge next-4284 -> next-4284-merge.

Browse Source
This commit is contained in:
Konstantin Osipov
2010-02-03 14:10:37 +03:00
parent b7a80c679c 0ede71256f
commit dfc15e2acc
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/repair.result
View File

@@ -169,3 +169,17 @@ test.t1 repair Error Table 't1' was locked with a READ lock and can't be updated
test.t1 repair status Operation failed test.t1 repair status Operation failed
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
#
# Test for bug #50784 "MDL: Assertion `m_tickets.is_empty() ||
# m_tickets.front() == m_trans_sentinel'"
#
drop tables if exists t1, t2;
create table t1 (i int);
create table t2 (j int);
set @@autocommit= 0;
repair table t1, t2;
Table Op Msg_type Msg_text
test.t1 repair status OK
test.t2 repair status OK
set @@autocommit= default;
drop tables t1, t2;

15
mysql-test/t/repair.test
View File

@@ -173,3 +173,18 @@ REPAIR TABLE t1;
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # Test for bug #50784 "MDL: Assertion `m_tickets.is_empty() ||
--echo # m_tickets.front() == m_trans_sentinel'"
--echo #
--disable_warnings
drop tables if exists t1, t2;
--enable_warnings
create table t1 (i int);
create table t2 (j int);
set @@autocommit= 0;
repair table t1, t2;
set @@autocommit= default;
drop tables t1, t2;

2
sql/sql_table.cc
View File

@@ -5031,6 +5031,7 @@ send_result_message:
trans_commit_stmt(thd); trans_commit_stmt(thd);
trans_commit_implicit(thd); trans_commit_implicit(thd);
close_thread_tables(thd); close_thread_tables(thd);
thd->mdl_context.release_transactional_locks();
table->table=0; // For query cache table->table=0; // For query cache
/* /*
@@ -5060,6 +5061,7 @@ err:
trans_rollback_stmt(thd); trans_rollback_stmt(thd);
trans_rollback(thd); trans_rollback(thd);
close_thread_tables(thd); // Shouldn't be needed close_thread_tables(thd); // Shouldn't be needed
thd->mdl_context.release_transactional_locks();
if (table) if (table)
table->table=0; table->table=0;
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);