1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge next-4284 -> next-4284-merge

Browse Source
This commit is contained in:
Konstantin Osipov 2010-02-06 13:30:07 +03:00
commit f750b5f160
4 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/include/handler.inc
View File

@ -1522,3 +1522,23 @@ HANDLER t2 READ FIRST;
HANDLER t2 CLOSE; HANDLER t2 CLOSE;
DROP TABLE t1, t2; DROP TABLE t1, t2;
--echo #
--echo # Bug#50912 Assertion `ticket->m_type >= mdl_request->type'
--echo # failed on HANDLER + I_S
--echo #
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
CREATE TABLE t1 (id INT);
HANDLER t1 OPEN;
# This used to trigger the assert.
SELECT table_name, table_comment FROM information_schema.tables
WHERE table_schema= 'test' AND table_name= 't1';
HANDLER t1 CLOSE;
DROP TABLE t1;

13
mysql-test/r/handler_innodb.result
View File

@ -1476,3 +1476,16 @@ HANDLER t2 READ FIRST;
i i
HANDLER t2 CLOSE; HANDLER t2 CLOSE;
DROP TABLE t1, t2; DROP TABLE t1, t2;
#
# Bug#50912 Assertion `ticket->m_type >= mdl_request->type'
# failed on HANDLER + I_S
#
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT);
HANDLER t1 OPEN;
SELECT table_name, table_comment FROM information_schema.tables
WHERE table_schema= 'test' AND table_name= 't1';
table_name table_comment
t1
HANDLER t1 CLOSE;
DROP TABLE t1;

13
mysql-test/r/handler_myisam.result
View File

@ -1474,6 +1474,19 @@ i
HANDLER t2 CLOSE; HANDLER t2 CLOSE;
DROP TABLE t1, t2; DROP TABLE t1, t2;
# #
# Bug#50912 Assertion `ticket->m_type >= mdl_request->type'
# failed on HANDLER + I_S
#
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT);
HANDLER t1 OPEN;
SELECT table_name, table_comment FROM information_schema.tables
WHERE table_schema= 'test' AND table_name= 't1';
table_name table_comment
t1
HANDLER t1 CLOSE;
DROP TABLE t1;
#
# BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash # BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash
# #
CREATE TABLE t1 AS SELECT 1 AS f1; CREATE TABLE t1 AS SELECT 1 AS f1;

4
sql/mdl.cc
View File

@ -1261,7 +1261,7 @@ MDL_context::try_acquire_lock(MDL_request *mdl_request)
if ((ticket= find_ticket(mdl_request, &is_transactional))) if ((ticket= find_ticket(mdl_request, &is_transactional)))
{ {
DBUG_ASSERT(ticket->m_lock); DBUG_ASSERT(ticket->m_lock);
DBUG_ASSERT(ticket->m_type >= mdl_request->type); DBUG_ASSERT(ticket->has_stronger_or_equal_type(mdl_request->type));
/* /*
If the request is for a transactional lock, and we found If the request is for a transactional lock, and we found
a transactional lock, just reuse the found ticket. a transactional lock, just reuse the found ticket.
@ -1349,7 +1349,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
return TRUE; return TRUE;
/* clone() is not supposed to be used to get a stronger lock. */ /* clone() is not supposed to be used to get a stronger lock. */
DBUG_ASSERT(ticket->m_type <= mdl_request->ticket->m_type); DBUG_ASSERT(mdl_request->ticket->has_stronger_or_equal_type(ticket->m_type));
ticket->m_lock= mdl_request->ticket->m_lock; ticket->m_lock= mdl_request->ticket->m_lock;
mdl_request->ticket= ticket; mdl_request->ticket= ticket;