2005-10-27 07:29:40 +00:00
|
|
|
/******************************************************
|
|
|
|
The transaction lock system
|
|
|
|
|
|
|
|
(c) 1996 Innobase Oy
|
|
|
|
|
|
|
|
Created 5/7/1996 Heikki Tuuri
|
|
|
|
*******************************************************/
|
|
|
|
|
2007-08-01 11:18:43 +00:00
|
|
|
#define LOCK_MODULE_IMPLEMENTATION
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
#include "lock0lock.h"
|
2007-08-01 11:18:43 +00:00
|
|
|
#include "lock0priv.h"
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
#ifdef UNIV_NONINL
|
|
|
|
#include "lock0lock.ic"
|
2007-08-01 11:18:43 +00:00
|
|
|
#include "lock0priv.ic"
|
2005-10-27 07:29:40 +00:00
|
|
|
#endif
|
|
|
|
|
2007-12-16 16:13:53 +00:00
|
|
|
#include "ha_prototypes.h"
|
2005-10-27 07:29:40 +00:00
|
|
|
#include "usr0sess.h"
|
|
|
|
#include "trx0purge.h"
|
|
|
|
#include "dict0mem.h"
|
|
|
|
#include "trx0sys.h"
|
|
|
|
|
|
|
|
/* Restricts the length of search we will do in the waits-for
|
|
|
|
graph of transactions */
|
|
|
|
#define LOCK_MAX_N_STEPS_IN_DEADLOCK_CHECK 1000000
|
|
|
|
|
|
|
|
/* Restricts the recursion depth of the search we will do in the waits-for
|
|
|
|
graph of transactions */
|
|
|
|
#define LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK 200
|
|
|
|
|
|
|
|
/* When releasing transaction locks, this specifies how often we release
|
|
|
|
the kernel mutex for a moment to give also others access to it */
|
|
|
|
|
|
|
|
#define LOCK_RELEASE_KERNEL_INTERVAL 1000
|
|
|
|
|
|
|
|
/* Safety margin when creating a new record lock: this many extra records
|
|
|
|
can be inserted to the page without need to create a lock with a bigger
|
|
|
|
bitmap */
|
|
|
|
|
|
|
|
#define LOCK_PAGE_BITMAP_MARGIN 64
|
|
|
|
|
|
|
|
/* An explicit record lock affects both the record and the gap before it.
|
|
|
|
An implicit x-lock does not affect the gap, it only locks the index
|
2006-02-23 19:25:29 +00:00
|
|
|
record from read or update.
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
If a transaction has modified or inserted an index record, then
|
|
|
|
it owns an implicit x-lock on the record. On a secondary index record,
|
|
|
|
a transaction has an implicit x-lock also if it has modified the
|
|
|
|
clustered index record, the max trx id of the page where the secondary
|
|
|
|
index record resides is >= trx id of the transaction (or database recovery
|
|
|
|
is running), and there are no explicit non-gap lock requests on the
|
|
|
|
secondary index record.
|
|
|
|
|
|
|
|
This complicated definition for a secondary index comes from the
|
|
|
|
implementation: we want to be able to determine if a secondary index
|
|
|
|
record has an implicit x-lock, just by looking at the present clustered
|
|
|
|
index record, not at the historical versions of the record. The
|
|
|
|
complicated definition can be explained to the user so that there is
|
|
|
|
nondeterminism in the access path when a query is answered: we may,
|
|
|
|
or may not, access the clustered index record and thus may, or may not,
|
|
|
|
bump into an x-lock set there.
|
|
|
|
|
|
|
|
Different transaction can have conflicting locks set on the gap at the
|
|
|
|
same time. The locks on the gap are purely inhibitive: an insert cannot
|
|
|
|
be made, or a select cursor may have to wait if a different transaction
|
|
|
|
has a conflicting lock on the gap. An x-lock on the gap does not give
|
|
|
|
the right to insert into the gap.
|
|
|
|
|
|
|
|
An explicit lock can be placed on a user record or the supremum record of
|
|
|
|
a page. The locks on the supremum record are always thought to be of the gap
|
|
|
|
type, though the gap bit is not set. When we perform an update of a record
|
|
|
|
where the size of the record changes, we may temporarily store its explicit
|
|
|
|
locks on the infimum record of the page, though the infimum otherwise never
|
|
|
|
carries locks.
|
|
|
|
|
|
|
|
A waiting record lock can also be of the gap type. A waiting lock request
|
|
|
|
can be granted when there is no conflicting mode lock request by another
|
|
|
|
transaction ahead of it in the explicit lock queue.
|
|
|
|
|
|
|
|
In version 4.0.5 we added yet another explicit lock type: LOCK_REC_NOT_GAP.
|
|
|
|
It only locks the record it is placed on, not the gap before the record.
|
|
|
|
This lock type is necessary to emulate an Oracle-like READ COMMITTED isolation
|
|
|
|
level.
|
|
|
|
|
|
|
|
-------------------------------------------------------------------------
|
|
|
|
RULE 1: If there is an implicit x-lock on a record, and there are non-gap
|
|
|
|
-------
|
|
|
|
lock requests waiting in the queue, then the transaction holding the implicit
|
|
|
|
x-lock also has an explicit non-gap record x-lock. Therefore, as locks are
|
|
|
|
released, we can grant locks to waiting lock requests purely by looking at
|
|
|
|
the explicit lock requests in the queue.
|
|
|
|
|
|
|
|
RULE 3: Different transactions cannot have conflicting granted non-gap locks
|
|
|
|
-------
|
|
|
|
on a record at the same time. However, they can have conflicting granted gap
|
|
|
|
locks.
|
|
|
|
RULE 4: If a there is a waiting lock request in a queue, no lock request,
|
|
|
|
-------
|
|
|
|
gap or not, can be inserted ahead of it in the queue. In record deletes
|
|
|
|
and page splits new gap type locks can be created by the database manager
|
|
|
|
for a transaction, and without rule 4, the waits-for graph of transactions
|
|
|
|
might become cyclic without the database noticing it, as the deadlock check
|
|
|
|
is only performed when a transaction itself requests a lock!
|
|
|
|
-------------------------------------------------------------------------
|
|
|
|
|
|
|
|
An insert is allowed to a gap if there are no explicit lock requests by
|
|
|
|
other transactions on the next record. It does not matter if these lock
|
|
|
|
requests are granted or waiting, gap bit set or not, with the exception
|
|
|
|
that a gap type request set by another transaction to wait for
|
|
|
|
its turn to do an insert is ignored. On the other hand, an
|
|
|
|
implicit x-lock by another transaction does not prevent an insert, which
|
|
|
|
allows for more concurrency when using an Oracle-style sequence number
|
|
|
|
generator for the primary key with many transactions doing inserts
|
|
|
|
concurrently.
|
|
|
|
|
|
|
|
A modify of a record is allowed if the transaction has an x-lock on the
|
|
|
|
record, or if other transactions do not have any non-gap lock requests on the
|
|
|
|
record.
|
|
|
|
|
|
|
|
A read of a single user record with a cursor is allowed if the transaction
|
|
|
|
has a non-gap explicit, or an implicit lock on the record, or if the other
|
|
|
|
transactions have no x-lock requests on the record. At a page supremum a
|
|
|
|
read is always allowed.
|
|
|
|
|
|
|
|
In summary, an implicit lock is seen as a granted x-lock only on the
|
|
|
|
record, not on the gap. An explicit lock with no gap bit set is a lock
|
|
|
|
both on the record and the gap. If the gap bit is set, the lock is only
|
|
|
|
on the gap. Different transaction cannot own conflicting locks on the
|
|
|
|
record at the same time, but they may own conflicting locks on the gap.
|
|
|
|
Granted locks on a record give an access right to the record, but gap type
|
|
|
|
locks just inhibit operations.
|
|
|
|
|
|
|
|
NOTE: Finding out if some transaction has an implicit x-lock on a secondary
|
|
|
|
index record can be cumbersome. We may have to look at previous versions of
|
|
|
|
the corresponding clustered index record to find out if a delete marked
|
|
|
|
secondary index record was delete marked by an active transaction, not by
|
|
|
|
a committed one.
|
|
|
|
|
|
|
|
FACT A: If a transaction has inserted a row, it can delete it any time
|
|
|
|
without need to wait for locks.
|
|
|
|
|
|
|
|
PROOF: The transaction has an implicit x-lock on every index record inserted
|
|
|
|
for the row, and can thus modify each record without the need to wait. Q.E.D.
|
|
|
|
|
|
|
|
FACT B: If a transaction has read some result set with a cursor, it can read
|
|
|
|
it again, and retrieves the same result set, if it has not modified the
|
|
|
|
result set in the meantime. Hence, there is no phantom problem. If the
|
|
|
|
biggest record, in the alphabetical order, touched by the cursor is removed,
|
|
|
|
a lock wait may occur, otherwise not.
|
|
|
|
|
|
|
|
PROOF: When a read cursor proceeds, it sets an s-lock on each user record
|
|
|
|
it passes, and a gap type s-lock on each page supremum. The cursor must
|
|
|
|
wait until it has these locks granted. Then no other transaction can
|
|
|
|
have a granted x-lock on any of the user records, and therefore cannot
|
|
|
|
modify the user records. Neither can any other transaction insert into
|
|
|
|
the gaps which were passed over by the cursor. Page splits and merges,
|
|
|
|
and removal of obsolete versions of records do not affect this, because
|
|
|
|
when a user record or a page supremum is removed, the next record inherits
|
|
|
|
its locks as gap type locks, and therefore blocks inserts to the same gap.
|
|
|
|
Also, if a page supremum is inserted, it inherits its locks from the successor
|
|
|
|
record. When the cursor is positioned again at the start of the result set,
|
|
|
|
the records it will touch on its course are either records it touched
|
|
|
|
during the last pass or new inserted page supremums. It can immediately
|
|
|
|
access all these records, and when it arrives at the biggest record, it
|
|
|
|
notices that the result set is complete. If the biggest record was removed,
|
|
|
|
lock wait can occur because the next record only inherits a gap type lock,
|
|
|
|
and a wait may be needed. Q.E.D. */
|
|
|
|
|
|
|
|
/* If an index record should be changed or a new inserted, we must check
|
|
|
|
the lock on the record or the next. When a read cursor starts reading,
|
|
|
|
we will set a record level s-lock on each record it passes, except on the
|
|
|
|
initial record on which the cursor is positioned before we start to fetch
|
|
|
|
records. Our index tree search has the convention that the B-tree
|
|
|
|
cursor is positioned BEFORE the first possibly matching record in
|
|
|
|
the search. Optimizations are possible here: if the record is searched
|
|
|
|
on an equality condition to a unique key, we could actually set a special
|
|
|
|
lock on the record, a lock which would not prevent any insert before
|
|
|
|
this record. In the next key locking an x-lock set on a record also
|
|
|
|
prevents inserts just before that record.
|
|
|
|
There are special infimum and supremum records on each page.
|
|
|
|
A supremum record can be locked by a read cursor. This records cannot be
|
|
|
|
updated but the lock prevents insert of a user record to the end of
|
|
|
|
the page.
|
|
|
|
Next key locks will prevent the phantom problem where new rows
|
|
|
|
could appear to SELECT result sets after the select operation has been
|
|
|
|
performed. Prevention of phantoms ensures the serilizability of
|
|
|
|
transactions.
|
|
|
|
What should we check if an insert of a new record is wanted?
|
|
|
|
Only the lock on the next record on the same page, because also the
|
|
|
|
supremum record can carry a lock. An s-lock prevents insertion, but
|
|
|
|
what about an x-lock? If it was set by a searched update, then there
|
|
|
|
is implicitly an s-lock, too, and the insert should be prevented.
|
|
|
|
What if our transaction owns an x-lock to the next record, but there is
|
|
|
|
a waiting s-lock request on the next record? If this s-lock was placed
|
|
|
|
by a read cursor moving in the ascending order in the index, we cannot
|
|
|
|
do the insert immediately, because when we finally commit our transaction,
|
|
|
|
the read cursor should see also the new inserted record. So we should
|
|
|
|
move the read cursor backward from the the next record for it to pass over
|
|
|
|
the new inserted record. This move backward may be too cumbersome to
|
|
|
|
implement. If we in this situation just enqueue a second x-lock request
|
|
|
|
for our transaction on the next record, then the deadlock mechanism
|
|
|
|
notices a deadlock between our transaction and the s-lock request
|
|
|
|
transaction. This seems to be an ok solution.
|
|
|
|
We could have the convention that granted explicit record locks,
|
|
|
|
lock the corresponding records from changing, and also lock the gaps
|
|
|
|
before them from inserting. A waiting explicit lock request locks the gap
|
|
|
|
before from inserting. Implicit record x-locks, which we derive from the
|
|
|
|
transaction id in the clustered index record, only lock the record itself
|
|
|
|
from modification, not the gap before it from inserting.
|
|
|
|
How should we store update locks? If the search is done by a unique
|
|
|
|
key, we could just modify the record trx id. Otherwise, we could put a record
|
|
|
|
x-lock on the record. If the update changes ordering fields of the
|
|
|
|
clustered index record, the inserted new record needs no record lock in
|
|
|
|
lock table, the trx id is enough. The same holds for a secondary index
|
|
|
|
record. Searched delete is similar to update.
|
|
|
|
|
|
|
|
PROBLEM:
|
|
|
|
What about waiting lock requests? If a transaction is waiting to make an
|
|
|
|
update to a record which another modified, how does the other transaction
|
|
|
|
know to send the end-lock-wait signal to the waiting transaction? If we have
|
|
|
|
the convention that a transaction may wait for just one lock at a time, how
|
|
|
|
do we preserve it if lock wait ends?
|
|
|
|
|
|
|
|
PROBLEM:
|
|
|
|
Checking the trx id label of a secondary index record. In the case of a
|
|
|
|
modification, not an insert, is this necessary? A secondary index record
|
|
|
|
is modified only by setting or resetting its deleted flag. A secondary index
|
|
|
|
record contains fields to uniquely determine the corresponding clustered
|
|
|
|
index record. A secondary index record is therefore only modified if we
|
|
|
|
also modify the clustered index record, and the trx id checking is done
|
|
|
|
on the clustered index record, before we come to modify the secondary index
|
|
|
|
record. So, in the case of delete marking or unmarking a secondary index
|
|
|
|
record, we do not have to care about trx ids, only the locks in the lock
|
|
|
|
table must be checked. In the case of a select from a secondary index, the
|
|
|
|
trx id is relevant, and in this case we may have to search the clustered
|
|
|
|
index record.
|
|
|
|
|
|
|
|
PROBLEM: How to update record locks when page is split or merged, or
|
|
|
|
--------------------------------------------------------------------
|
|
|
|
a record is deleted or updated?
|
|
|
|
If the size of fields in a record changes, we perform the update by
|
|
|
|
a delete followed by an insert. How can we retain the locks set or
|
|
|
|
waiting on the record? Because a record lock is indexed in the bitmap
|
|
|
|
by the heap number of the record, when we remove the record from the
|
|
|
|
record list, it is possible still to keep the lock bits. If the page
|
|
|
|
is reorganized, we could make a table of old and new heap numbers,
|
|
|
|
and permute the bitmaps in the locks accordingly. We can add to the
|
|
|
|
table a row telling where the updated record ended. If the update does
|
|
|
|
not require a reorganization of the page, we can simply move the lock
|
|
|
|
bits for the updated record to the position determined by its new heap
|
|
|
|
number (we may have to allocate a new lock, if we run out of the bitmap
|
|
|
|
in the old one).
|
|
|
|
A more complicated case is the one where the reinsertion of the
|
|
|
|
updated record is done pessimistically, because the structure of the
|
|
|
|
tree may change.
|
|
|
|
|
|
|
|
PROBLEM: If a supremum record is removed in a page merge, or a record
|
|
|
|
---------------------------------------------------------------------
|
|
|
|
removed in a purge, what to do to the waiting lock requests? In a split to
|
|
|
|
the right, we just move the lock requests to the new supremum. If a record
|
|
|
|
is removed, we could move the waiting lock request to its inheritor, the
|
|
|
|
next record in the index. But, the next record may already have lock
|
|
|
|
requests on its own queue. A new deadlock check should be made then. Maybe
|
|
|
|
it is easier just to release the waiting transactions. They can then enqueue
|
|
|
|
new lock requests on appropriate records.
|
|
|
|
|
|
|
|
PROBLEM: When a record is inserted, what locks should it inherit from the
|
|
|
|
-------------------------------------------------------------------------
|
|
|
|
upper neighbor? An insert of a new supremum record in a page split is
|
|
|
|
always possible, but an insert of a new user record requires that the upper
|
|
|
|
neighbor does not have any lock requests by other transactions, granted or
|
|
|
|
waiting, in its lock queue. Solution: We can copy the locks as gap type
|
|
|
|
locks, so that also the waiting locks are transformed to granted gap type
|
|
|
|
locks on the inserted record. */
|
|
|
|
|
|
|
|
/* LOCK COMPATIBILITY MATRIX
|
|
|
|
* IS IX S X AI
|
2006-02-23 19:25:29 +00:00
|
|
|
* IS + + + - +
|
|
|
|
* IX + + - - +
|
|
|
|
* S + - + - -
|
|
|
|
* X - - - - -
|
|
|
|
* AI + + - - -
|
2005-10-27 07:29:40 +00:00
|
|
|
*
|
|
|
|
* Note that for rows, InnoDB only acquires S or X locks.
|
|
|
|
* For tables, InnoDB normally acquires IS or IX locks.
|
|
|
|
* S or X table locks are only acquired for LOCK TABLES.
|
|
|
|
* Auto-increment (AI) locks are needed because of
|
|
|
|
* statement-level MySQL binlog.
|
|
|
|
* See also lock_mode_compatible().
|
|
|
|
*/
|
2007-02-01 20:56:23 +00:00
|
|
|
#define LK(a,b) (1 << ((a) * LOCK_NUM + (b)))
|
|
|
|
#define LKS(a,b) LK(a,b) | LK(b,a)
|
|
|
|
|
|
|
|
/* Define the lock compatibility matrix in a ulint. The first line below
|
|
|
|
defines the diagonal entries. The following lines define the compatibility
|
|
|
|
for LOCK_IX, LOCK_S, and LOCK_AUTO_INC using LKS(), since the matrix
|
|
|
|
is symmetric. */
|
|
|
|
#define LOCK_MODE_COMPATIBILITY 0 \
|
|
|
|
| LK(LOCK_IS, LOCK_IS) | LK(LOCK_IX, LOCK_IX) | LK(LOCK_S, LOCK_S) \
|
|
|
|
| LKS(LOCK_IX, LOCK_IS) | LKS(LOCK_IS, LOCK_AUTO_INC) \
|
|
|
|
| LKS(LOCK_S, LOCK_IS) \
|
|
|
|
| LKS(LOCK_AUTO_INC, LOCK_IS) | LKS(LOCK_AUTO_INC, LOCK_IX)
|
|
|
|
|
|
|
|
/* STRONGER-OR-EQUAL RELATION (mode1=row, mode2=column)
|
|
|
|
* IS IX S X AI
|
|
|
|
* IS + - - - -
|
|
|
|
* IX + + - - -
|
|
|
|
* S + - + - -
|
|
|
|
* X + + + + +
|
|
|
|
* AI - - - - +
|
|
|
|
* See lock_mode_stronger_or_eq().
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Define the stronger-or-equal lock relation in a ulint. This relation
|
|
|
|
contains all pairs LK(mode1, mode2) where mode1 is stronger than or
|
|
|
|
equal to mode2. */
|
|
|
|
#define LOCK_MODE_STRONGER_OR_EQ 0 \
|
|
|
|
| LK(LOCK_IS, LOCK_IS) \
|
|
|
|
| LK(LOCK_IX, LOCK_IS) | LK(LOCK_IX, LOCK_IX) \
|
|
|
|
| LK(LOCK_S, LOCK_IS) | LK(LOCK_S, LOCK_S) \
|
|
|
|
| LK(LOCK_AUTO_INC, LOCK_AUTO_INC) \
|
|
|
|
| LK(LOCK_X, LOCK_IS) | LK(LOCK_X, LOCK_IX) | LK(LOCK_X, LOCK_S) \
|
|
|
|
| LK(LOCK_X, LOCK_AUTO_INC) | LK(LOCK_X, LOCK_X)
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN ibool lock_print_waits = FALSE;
|
2006-10-24 06:45:52 +00:00
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Validates the lock system. */
|
|
|
|
static
|
|
|
|
ibool
|
|
|
|
lock_validate(void);
|
|
|
|
/*===============*/
|
|
|
|
/* out: TRUE if ok */
|
2007-01-22 08:48:00 +00:00
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Validates the record lock queues on a page. */
|
|
|
|
static
|
|
|
|
ibool
|
|
|
|
lock_rec_validate_page(
|
|
|
|
/*===================*/
|
|
|
|
/* out: TRUE if ok */
|
|
|
|
ulint space, /* in: space id */
|
|
|
|
ulint page_no);/* in: page number */
|
2007-01-22 10:24:21 +00:00
|
|
|
|
|
|
|
/* Define the following in order to enable lock_rec_validate_page() checks. */
|
|
|
|
# undef UNIV_DEBUG_LOCK_VALIDATE
|
2005-10-27 07:29:40 +00:00
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
/* The lock system */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN lock_sys_t* lock_sys = NULL;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* We store info on the latest deadlock error to this buffer. InnoDB
|
|
|
|
Monitor will then fetch it and print */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN ibool lock_deadlock_found = FALSE;
|
|
|
|
UNIV_INTERN FILE* lock_latest_err_file;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Flags for recursive deadlock search */
|
|
|
|
#define LOCK_VICTIM_IS_START 1
|
|
|
|
#define LOCK_VICTIM_IS_OTHER 2
|
|
|
|
|
|
|
|
/************************************************************************
|
|
|
|
Checks if a lock request results in a deadlock. */
|
|
|
|
static
|
|
|
|
ibool
|
|
|
|
lock_deadlock_occurs(
|
|
|
|
/*=================*/
|
|
|
|
/* out: TRUE if a deadlock was detected and we
|
|
|
|
chose trx as a victim; FALSE if no deadlock, or
|
|
|
|
there was a deadlock, but we chose other
|
|
|
|
transaction(s) as victim(s) */
|
|
|
|
lock_t* lock, /* in: lock the transaction is requesting */
|
|
|
|
trx_t* trx); /* in: transaction */
|
|
|
|
/************************************************************************
|
|
|
|
Looks recursively for a deadlock. */
|
|
|
|
static
|
|
|
|
ulint
|
|
|
|
lock_deadlock_recursive(
|
|
|
|
/*====================*/
|
|
|
|
/* out: 0 if no deadlock found,
|
|
|
|
LOCK_VICTIM_IS_START if there was a deadlock
|
|
|
|
and we chose 'start' as the victim,
|
|
|
|
LOCK_VICTIM_IS_OTHER if a deadlock
|
|
|
|
was found and we chose some other trx as a
|
|
|
|
victim: we must do the search again in this
|
|
|
|
last case because there may be another
|
|
|
|
deadlock! */
|
|
|
|
trx_t* start, /* in: recursion starting point */
|
|
|
|
trx_t* trx, /* in: a transaction waiting for a lock */
|
|
|
|
lock_t* wait_lock, /* in: the lock trx is waiting to be granted */
|
|
|
|
ulint* cost, /* in/out: number of calculation steps thus
|
|
|
|
far: if this exceeds LOCK_MAX_N_STEPS_...
|
|
|
|
we return LOCK_VICTIM_IS_START */
|
2006-02-23 19:25:29 +00:00
|
|
|
ulint depth); /* in: recursion depth: if this exceeds
|
2005-10-27 07:29:40 +00:00
|
|
|
LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK, we
|
|
|
|
return LOCK_VICTIM_IS_START */
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the nth bit of a record lock. */
|
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
lock_rec_get_nth_bit(
|
|
|
|
/*=================*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: TRUE if bit set */
|
|
|
|
const lock_t* lock, /* in: record lock */
|
|
|
|
ulint i) /* in: index of the bit */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint byte_index;
|
|
|
|
ulint bit_index;
|
|
|
|
|
|
|
|
ut_ad(lock);
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (i >= lock->un_member.rec_lock.n_bits) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
byte_index = i / 8;
|
|
|
|
bit_index = i % 8;
|
|
|
|
|
2007-01-22 08:48:00 +00:00
|
|
|
return(1 & ((const byte*) &lock[1])[byte_index] >> bit_index);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
#define lock_mutex_enter_kernel() mutex_enter(&kernel_mutex)
|
|
|
|
#define lock_mutex_exit_kernel() mutex_exit(&kernel_mutex)
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks that a transaction id is sensible, i.e., not in the future. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_check_trx_id_sanity(
|
|
|
|
/*=====================*/
|
|
|
|
/* out: TRUE if ok */
|
|
|
|
dulint trx_id, /* in: trx id */
|
2006-10-24 06:45:52 +00:00
|
|
|
const rec_t* rec, /* in: user record */
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_t* index, /* in: index */
|
|
|
|
const ulint* offsets, /* in: rec_get_offsets(rec, index) */
|
|
|
|
ibool has_kernel_mutex)/* in: TRUE if the caller owns the
|
|
|
|
kernel mutex */
|
|
|
|
{
|
|
|
|
ibool is_ok = TRUE;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
|
|
|
|
if (!has_kernel_mutex) {
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* A sanity check: the trx_id in rec must be smaller than the global
|
|
|
|
trx id counter */
|
|
|
|
|
|
|
|
if (ut_dulint_cmp(trx_id, trx_sys->max_trx_id) >= 0) {
|
|
|
|
ut_print_timestamp(stderr);
|
2006-02-27 09:33:26 +00:00
|
|
|
fputs(" InnoDB: Error: transaction id associated"
|
2006-08-29 09:30:31 +00:00
|
|
|
" with record\n",
|
|
|
|
stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_print_new(stderr, rec, offsets);
|
|
|
|
fputs("InnoDB: in ", stderr);
|
|
|
|
dict_index_name_print(stderr, NULL, index);
|
|
|
|
fprintf(stderr, "\n"
|
2007-12-20 14:08:16 +00:00
|
|
|
"InnoDB: is " TRX_ID_FMT " which is higher than the"
|
|
|
|
" global trx id counter " TRX_ID_FMT "!\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: The table is corrupt. You have to do"
|
|
|
|
" dump + drop + reimport.\n",
|
2007-12-20 14:08:16 +00:00
|
|
|
TRX_ID_PREP_PRINTF(trx_id),
|
|
|
|
TRX_ID_PREP_PRINTF(trx_sys->max_trx_id));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
is_ok = FALSE;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!has_kernel_mutex) {
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(is_ok);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks that a record is seen in a consistent read. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_clust_rec_cons_read_sees(
|
|
|
|
/*==========================*/
|
|
|
|
/* out: TRUE if sees, or FALSE if an earlier
|
|
|
|
version of the record should be retrieved */
|
2006-10-24 06:45:52 +00:00
|
|
|
const rec_t* rec, /* in: user record which should be read or
|
2005-10-27 07:29:40 +00:00
|
|
|
passed over by a read cursor */
|
|
|
|
dict_index_t* index, /* in: clustered index */
|
|
|
|
const ulint* offsets,/* in: rec_get_offsets(rec, index) */
|
|
|
|
read_view_t* view) /* in: consistent read view */
|
|
|
|
{
|
|
|
|
dulint trx_id;
|
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
ut_ad(dict_index_is_clust(index));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(page_rec_is_user_rec(rec));
|
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
|
|
|
|
/* NOTE that we call this function while holding the search
|
|
|
|
system latch. To obey the latching order we must NOT reserve the
|
|
|
|
kernel mutex here! */
|
|
|
|
|
|
|
|
trx_id = row_get_rec_trx_id(rec, index, offsets);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(read_view_sees_trx_id(view, trx_id));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks that a non-clustered index record is seen in a consistent read. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_sec_rec_cons_read_sees(
|
|
|
|
/*========================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: TRUE if certainly
|
|
|
|
sees, or FALSE if an earlier
|
|
|
|
version of the clustered index
|
|
|
|
record might be needed: NOTE
|
|
|
|
that a non-clustered index
|
|
|
|
page contains so little
|
|
|
|
information on its
|
|
|
|
modifications that also in the
|
|
|
|
case FALSE, the present
|
|
|
|
version of rec may be the
|
|
|
|
right, but we must check this
|
|
|
|
from the clustered index
|
|
|
|
record */
|
|
|
|
const rec_t* rec, /* in: user record which
|
|
|
|
should be read or passed over
|
|
|
|
by a read cursor */
|
|
|
|
const read_view_t* view) /* in: consistent read view */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
dulint max_trx_id;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(page_rec_is_user_rec(rec));
|
|
|
|
|
|
|
|
/* NOTE that we might call this function while holding the search
|
|
|
|
system latch. To obey the latching order we must NOT reserve the
|
|
|
|
kernel mutex here! */
|
|
|
|
|
|
|
|
if (recv_recovery_is_on()) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
2007-10-03 12:22:29 +00:00
|
|
|
max_trx_id = page_get_max_trx_id(page_align(rec));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
return(ut_dulint_cmp(max_trx_id, view->up_limit_id) < 0);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Creates the lock system at database start. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_sys_create(
|
|
|
|
/*============*/
|
|
|
|
ulint n_cells) /* in: number of slots in lock hash table */
|
|
|
|
{
|
|
|
|
lock_sys = mem_alloc(sizeof(lock_sys_t));
|
|
|
|
|
|
|
|
lock_sys->rec_hash = hash_create(n_cells);
|
|
|
|
|
|
|
|
/* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */
|
|
|
|
|
|
|
|
lock_latest_err_file = os_file_create_tmpfile();
|
|
|
|
ut_a(lock_latest_err_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the size of a lock struct. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_get_size(void)
|
|
|
|
/*===============*/
|
|
|
|
/* out: size in bytes */
|
|
|
|
{
|
|
|
|
return((ulint)sizeof(lock_t));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the mode of a lock. */
|
|
|
|
UNIV_INLINE
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_get_mode(
|
|
|
|
/*==========*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: mode */
|
|
|
|
const lock_t* lock) /* in: lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(lock);
|
|
|
|
|
|
|
|
return(lock->type_mode & LOCK_MODE_MASK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the wait flag of a lock. */
|
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
lock_get_wait(
|
|
|
|
/*==========*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: TRUE if waiting */
|
|
|
|
const lock_t* lock) /* in: lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(lock);
|
|
|
|
|
2007-01-23 10:02:02 +00:00
|
|
|
if (UNIV_UNLIKELY(lock->type_mode & LOCK_WAIT)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the source table of an ALTER TABLE transaction. The table must be
|
|
|
|
covered by an IX or IS table lock. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_table_t*
|
|
|
|
lock_get_src_table(
|
|
|
|
/*===============*/
|
|
|
|
/* out: the source table of transaction,
|
|
|
|
if it is covered by an IX or IS table lock;
|
|
|
|
dest if there is no source table, and
|
|
|
|
NULL if the transaction is locking more than
|
|
|
|
two tables or an inconsistency is found */
|
|
|
|
trx_t* trx, /* in: transaction */
|
|
|
|
dict_table_t* dest, /* in: destination of ALTER TABLE */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode* mode) /* out: lock mode of the source table */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
dict_table_t* src;
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
src = NULL;
|
|
|
|
*mode = LOCK_NONE;
|
|
|
|
|
|
|
|
for (lock = UT_LIST_GET_FIRST(trx->trx_locks);
|
|
|
|
lock;
|
|
|
|
lock = UT_LIST_GET_NEXT(trx_locks, lock)) {
|
|
|
|
lock_table_t* tab_lock;
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode lock_mode;
|
2007-09-04 07:54:29 +00:00
|
|
|
if (!(lock_get_type_low(lock) & LOCK_TABLE)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* We are only interested in table locks. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
tab_lock = &lock->un_member.tab_lock;
|
|
|
|
if (dest == tab_lock->table) {
|
|
|
|
/* We are not interested in the destination table. */
|
|
|
|
continue;
|
|
|
|
} else if (!src) {
|
|
|
|
/* This presumably is the source table. */
|
|
|
|
src = tab_lock->table;
|
2006-08-29 09:30:31 +00:00
|
|
|
if (UT_LIST_GET_LEN(src->locks) != 1
|
|
|
|
|| UT_LIST_GET_FIRST(src->locks) != lock) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* We only support the case when
|
|
|
|
there is only one lock on this table. */
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
} else if (src != tab_lock->table) {
|
|
|
|
/* The transaction is locking more than
|
|
|
|
two tables (src and dest): abort */
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check that the source table is locked by
|
|
|
|
LOCK_IX or LOCK_IS. */
|
|
|
|
lock_mode = lock_get_mode(lock);
|
2007-02-01 20:56:23 +00:00
|
|
|
if (lock_mode == LOCK_IX || lock_mode == LOCK_IS) {
|
2005-10-27 07:29:40 +00:00
|
|
|
if (*mode != LOCK_NONE && *mode != lock_mode) {
|
|
|
|
/* There are multiple locks on src. */
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
*mode = lock_mode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!src) {
|
|
|
|
/* No source table lock found: flag the situation to caller */
|
|
|
|
src = dest;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(src);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Determine if the given table is exclusively "owned" by the given
|
|
|
|
transaction, i.e., transaction holds LOCK_IX and possibly LOCK_AUTO_INC
|
|
|
|
on the table. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_is_table_exclusive(
|
|
|
|
/*====================*/
|
|
|
|
/* out: TRUE if table is only locked by trx,
|
|
|
|
with LOCK_IX, and possibly LOCK_AUTO_INC */
|
|
|
|
dict_table_t* table, /* in: table */
|
|
|
|
trx_t* trx) /* in: transaction */
|
|
|
|
{
|
2006-10-26 13:05:45 +00:00
|
|
|
const lock_t* lock;
|
|
|
|
ibool ok = FALSE;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 3931:4006 from branches/zip:
------------------------------------------------------------------------
r3938 | marko | 2009-01-15 10:28:23 +0200 (Thu, 15 Jan 2009) | 3 lines
branches/zip: buf_LRU_invalidate_tablespace(), buf_LRU_free_block():
Add comments and assertions that buf_LRU_block_remove_hashed_page()
will release block_mutex when it returns BUF_BLOCK_ZIP_FREE.
------------------------------------------------------------------------
r3939 | marko | 2009-01-15 10:37:51 +0200 (Thu, 15 Jan 2009) | 7 lines
branches/zip: buf0lru.c: Improve debug assertions.
buf_LRU_block_free_non_file_page(): ut_ad(block) before dereferencing block.
buf_LRU_block_remove_hashed_page(): Forbid buf_pool_mutex_exit() while
calling buf_buddy_free(). Callers of buf_LRU_block_remove_hashed_page()
assume that the buffer pool mutex will not be released and reacquired.
------------------------------------------------------------------------
r3944 | vasil | 2009-01-15 21:15:00 +0200 (Thu, 15 Jan 2009) | 4 lines
branches/zip:
Add ChangeLog entries for the bug fixes in r3911 and r3930.
------------------------------------------------------------------------
r3958 | marko | 2009-01-16 14:53:40 +0200 (Fri, 16 Jan 2009) | 8 lines
branches/zip: Add assertions that the kernel_mutex is being held
while accessing table->locks or un_member.tab_lock.locks.
This is related to Issue #158. According to static analysis,
the added debug assertions should always hold.
lock_table_has_to_wait_in_queue(), lock_queue_iterator_reset(),
lock_queue_iterator_get_prev(), add_trx_relevant_locks_to_cache(),
fetch_data_into_cache(): Add ut_ad(mutex_own(&kernel_mutex)).
------------------------------------------------------------------------
r4006 | marko | 2009-01-20 16:29:22 +0200 (Tue, 20 Jan 2009) | 33 lines
branches/zip: Merge revisions 3930:4005 from branches/5.1:
------------------------------------------------------------------------
r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines
branches/5.1: Merge r4003 from branches/5.0:
rec_set_nth_field(): When the field already is SQL null,
do nothing when it is being changed to SQL null. (Bug #41571)
Normally, MySQL does not pass "do-nothing" updates to the storage engine.
When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT
is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted
without this fix.
rb://81 approved by Heikki Tuuri
------------------------------------------------------------------------
r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines
branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before
accessing table->locks and release kernel_mutex before returning from
the function. This fixes a portential race condition in the
"commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX,
and OPTIMIZE TABLE. (Bug #42152)
rb://80 approved by Heikki Tuuri
------------------------------------------------------------------------
2009-01-20 14:34:02 +00:00
|
|
|
ut_ad(table);
|
|
|
|
ut_ad(trx);
|
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
for (lock = UT_LIST_GET_FIRST(table->locks);
|
|
|
|
lock;
|
|
|
|
lock = UT_LIST_GET_NEXT(locks, &lock->un_member.tab_lock)) {
|
|
|
|
if (lock->trx != trx) {
|
|
|
|
/* A lock on the table is held
|
|
|
|
by some other transaction. */
|
branches/innodb+: Merge revisions 3931:4006 from branches/zip:
------------------------------------------------------------------------
r3938 | marko | 2009-01-15 10:28:23 +0200 (Thu, 15 Jan 2009) | 3 lines
branches/zip: buf_LRU_invalidate_tablespace(), buf_LRU_free_block():
Add comments and assertions that buf_LRU_block_remove_hashed_page()
will release block_mutex when it returns BUF_BLOCK_ZIP_FREE.
------------------------------------------------------------------------
r3939 | marko | 2009-01-15 10:37:51 +0200 (Thu, 15 Jan 2009) | 7 lines
branches/zip: buf0lru.c: Improve debug assertions.
buf_LRU_block_free_non_file_page(): ut_ad(block) before dereferencing block.
buf_LRU_block_remove_hashed_page(): Forbid buf_pool_mutex_exit() while
calling buf_buddy_free(). Callers of buf_LRU_block_remove_hashed_page()
assume that the buffer pool mutex will not be released and reacquired.
------------------------------------------------------------------------
r3944 | vasil | 2009-01-15 21:15:00 +0200 (Thu, 15 Jan 2009) | 4 lines
branches/zip:
Add ChangeLog entries for the bug fixes in r3911 and r3930.
------------------------------------------------------------------------
r3958 | marko | 2009-01-16 14:53:40 +0200 (Fri, 16 Jan 2009) | 8 lines
branches/zip: Add assertions that the kernel_mutex is being held
while accessing table->locks or un_member.tab_lock.locks.
This is related to Issue #158. According to static analysis,
the added debug assertions should always hold.
lock_table_has_to_wait_in_queue(), lock_queue_iterator_reset(),
lock_queue_iterator_get_prev(), add_trx_relevant_locks_to_cache(),
fetch_data_into_cache(): Add ut_ad(mutex_own(&kernel_mutex)).
------------------------------------------------------------------------
r4006 | marko | 2009-01-20 16:29:22 +0200 (Tue, 20 Jan 2009) | 33 lines
branches/zip: Merge revisions 3930:4005 from branches/5.1:
------------------------------------------------------------------------
r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines
branches/5.1: Merge r4003 from branches/5.0:
rec_set_nth_field(): When the field already is SQL null,
do nothing when it is being changed to SQL null. (Bug #41571)
Normally, MySQL does not pass "do-nothing" updates to the storage engine.
When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT
is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted
without this fix.
rb://81 approved by Heikki Tuuri
------------------------------------------------------------------------
r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines
branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before
accessing table->locks and release kernel_mutex before returning from
the function. This fixes a portential race condition in the
"commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX,
and OPTIMIZE TABLE. (Bug #42152)
rb://80 approved by Heikki Tuuri
------------------------------------------------------------------------
2009-01-20 14:34:02 +00:00
|
|
|
goto not_ok;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (!(lock_get_type_low(lock) & LOCK_TABLE)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* We are interested in table locks only. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (lock_get_mode(lock)) {
|
|
|
|
case LOCK_IX:
|
|
|
|
ok = TRUE;
|
|
|
|
break;
|
|
|
|
case LOCK_AUTO_INC:
|
|
|
|
/* It is allowed for trx to hold an
|
|
|
|
auto_increment lock. */
|
|
|
|
break;
|
|
|
|
default:
|
branches/innodb+: Merge revisions 3931:4006 from branches/zip:
------------------------------------------------------------------------
r3938 | marko | 2009-01-15 10:28:23 +0200 (Thu, 15 Jan 2009) | 3 lines
branches/zip: buf_LRU_invalidate_tablespace(), buf_LRU_free_block():
Add comments and assertions that buf_LRU_block_remove_hashed_page()
will release block_mutex when it returns BUF_BLOCK_ZIP_FREE.
------------------------------------------------------------------------
r3939 | marko | 2009-01-15 10:37:51 +0200 (Thu, 15 Jan 2009) | 7 lines
branches/zip: buf0lru.c: Improve debug assertions.
buf_LRU_block_free_non_file_page(): ut_ad(block) before dereferencing block.
buf_LRU_block_remove_hashed_page(): Forbid buf_pool_mutex_exit() while
calling buf_buddy_free(). Callers of buf_LRU_block_remove_hashed_page()
assume that the buffer pool mutex will not be released and reacquired.
------------------------------------------------------------------------
r3944 | vasil | 2009-01-15 21:15:00 +0200 (Thu, 15 Jan 2009) | 4 lines
branches/zip:
Add ChangeLog entries for the bug fixes in r3911 and r3930.
------------------------------------------------------------------------
r3958 | marko | 2009-01-16 14:53:40 +0200 (Fri, 16 Jan 2009) | 8 lines
branches/zip: Add assertions that the kernel_mutex is being held
while accessing table->locks or un_member.tab_lock.locks.
This is related to Issue #158. According to static analysis,
the added debug assertions should always hold.
lock_table_has_to_wait_in_queue(), lock_queue_iterator_reset(),
lock_queue_iterator_get_prev(), add_trx_relevant_locks_to_cache(),
fetch_data_into_cache(): Add ut_ad(mutex_own(&kernel_mutex)).
------------------------------------------------------------------------
r4006 | marko | 2009-01-20 16:29:22 +0200 (Tue, 20 Jan 2009) | 33 lines
branches/zip: Merge revisions 3930:4005 from branches/5.1:
------------------------------------------------------------------------
r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines
branches/5.1: Merge r4003 from branches/5.0:
rec_set_nth_field(): When the field already is SQL null,
do nothing when it is being changed to SQL null. (Bug #41571)
Normally, MySQL does not pass "do-nothing" updates to the storage engine.
When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT
is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted
without this fix.
rb://81 approved by Heikki Tuuri
------------------------------------------------------------------------
r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines
branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before
accessing table->locks and release kernel_mutex before returning from
the function. This fixes a portential race condition in the
"commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX,
and OPTIMIZE TABLE. (Bug #42152)
rb://80 approved by Heikki Tuuri
------------------------------------------------------------------------
2009-01-20 14:34:02 +00:00
|
|
|
not_ok:
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Other table locks than LOCK_IX are not allowed. */
|
branches/innodb+: Merge revisions 3931:4006 from branches/zip:
------------------------------------------------------------------------
r3938 | marko | 2009-01-15 10:28:23 +0200 (Thu, 15 Jan 2009) | 3 lines
branches/zip: buf_LRU_invalidate_tablespace(), buf_LRU_free_block():
Add comments and assertions that buf_LRU_block_remove_hashed_page()
will release block_mutex when it returns BUF_BLOCK_ZIP_FREE.
------------------------------------------------------------------------
r3939 | marko | 2009-01-15 10:37:51 +0200 (Thu, 15 Jan 2009) | 7 lines
branches/zip: buf0lru.c: Improve debug assertions.
buf_LRU_block_free_non_file_page(): ut_ad(block) before dereferencing block.
buf_LRU_block_remove_hashed_page(): Forbid buf_pool_mutex_exit() while
calling buf_buddy_free(). Callers of buf_LRU_block_remove_hashed_page()
assume that the buffer pool mutex will not be released and reacquired.
------------------------------------------------------------------------
r3944 | vasil | 2009-01-15 21:15:00 +0200 (Thu, 15 Jan 2009) | 4 lines
branches/zip:
Add ChangeLog entries for the bug fixes in r3911 and r3930.
------------------------------------------------------------------------
r3958 | marko | 2009-01-16 14:53:40 +0200 (Fri, 16 Jan 2009) | 8 lines
branches/zip: Add assertions that the kernel_mutex is being held
while accessing table->locks or un_member.tab_lock.locks.
This is related to Issue #158. According to static analysis,
the added debug assertions should always hold.
lock_table_has_to_wait_in_queue(), lock_queue_iterator_reset(),
lock_queue_iterator_get_prev(), add_trx_relevant_locks_to_cache(),
fetch_data_into_cache(): Add ut_ad(mutex_own(&kernel_mutex)).
------------------------------------------------------------------------
r4006 | marko | 2009-01-20 16:29:22 +0200 (Tue, 20 Jan 2009) | 33 lines
branches/zip: Merge revisions 3930:4005 from branches/5.1:
------------------------------------------------------------------------
r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines
branches/5.1: Merge r4003 from branches/5.0:
rec_set_nth_field(): When the field already is SQL null,
do nothing when it is being changed to SQL null. (Bug #41571)
Normally, MySQL does not pass "do-nothing" updates to the storage engine.
When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT
is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted
without this fix.
rb://81 approved by Heikki Tuuri
------------------------------------------------------------------------
r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines
branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before
accessing table->locks and release kernel_mutex before returning from
the function. This fixes a portential race condition in the
"commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX,
and OPTIMIZE TABLE. (Bug #42152)
rb://80 approved by Heikki Tuuri
------------------------------------------------------------------------
2009-01-20 14:34:02 +00:00
|
|
|
ok = FALSE;
|
|
|
|
goto func_exit;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 3931:4006 from branches/zip:
------------------------------------------------------------------------
r3938 | marko | 2009-01-15 10:28:23 +0200 (Thu, 15 Jan 2009) | 3 lines
branches/zip: buf_LRU_invalidate_tablespace(), buf_LRU_free_block():
Add comments and assertions that buf_LRU_block_remove_hashed_page()
will release block_mutex when it returns BUF_BLOCK_ZIP_FREE.
------------------------------------------------------------------------
r3939 | marko | 2009-01-15 10:37:51 +0200 (Thu, 15 Jan 2009) | 7 lines
branches/zip: buf0lru.c: Improve debug assertions.
buf_LRU_block_free_non_file_page(): ut_ad(block) before dereferencing block.
buf_LRU_block_remove_hashed_page(): Forbid buf_pool_mutex_exit() while
calling buf_buddy_free(). Callers of buf_LRU_block_remove_hashed_page()
assume that the buffer pool mutex will not be released and reacquired.
------------------------------------------------------------------------
r3944 | vasil | 2009-01-15 21:15:00 +0200 (Thu, 15 Jan 2009) | 4 lines
branches/zip:
Add ChangeLog entries for the bug fixes in r3911 and r3930.
------------------------------------------------------------------------
r3958 | marko | 2009-01-16 14:53:40 +0200 (Fri, 16 Jan 2009) | 8 lines
branches/zip: Add assertions that the kernel_mutex is being held
while accessing table->locks or un_member.tab_lock.locks.
This is related to Issue #158. According to static analysis,
the added debug assertions should always hold.
lock_table_has_to_wait_in_queue(), lock_queue_iterator_reset(),
lock_queue_iterator_get_prev(), add_trx_relevant_locks_to_cache(),
fetch_data_into_cache(): Add ut_ad(mutex_own(&kernel_mutex)).
------------------------------------------------------------------------
r4006 | marko | 2009-01-20 16:29:22 +0200 (Tue, 20 Jan 2009) | 33 lines
branches/zip: Merge revisions 3930:4005 from branches/5.1:
------------------------------------------------------------------------
r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines
branches/5.1: Merge r4003 from branches/5.0:
rec_set_nth_field(): When the field already is SQL null,
do nothing when it is being changed to SQL null. (Bug #41571)
Normally, MySQL does not pass "do-nothing" updates to the storage engine.
When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT
is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted
without this fix.
rb://81 approved by Heikki Tuuri
------------------------------------------------------------------------
r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines
branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before
accessing table->locks and release kernel_mutex before returning from
the function. This fixes a portential race condition in the
"commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX,
and OPTIMIZE TABLE. (Bug #42152)
rb://80 approved by Heikki Tuuri
------------------------------------------------------------------------
2009-01-20 14:34:02 +00:00
|
|
|
func_exit:
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(ok);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Sets the wait flag of a lock and the back pointer in trx to lock. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
lock_set_lock_and_trx_wait(
|
|
|
|
/*=======================*/
|
|
|
|
lock_t* lock, /* in: lock */
|
|
|
|
trx_t* trx) /* in: trx */
|
|
|
|
{
|
|
|
|
ut_ad(lock);
|
|
|
|
ut_ad(trx->wait_lock == NULL);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
trx->wait_lock = lock;
|
2006-10-26 13:05:45 +00:00
|
|
|
lock->type_mode |= LOCK_WAIT;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
The back pointer to a waiting lock request in the transaction is set to NULL
|
|
|
|
and the wait bit in lock type_mode is reset. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
lock_reset_lock_and_trx_wait(
|
|
|
|
/*=========================*/
|
|
|
|
lock_t* lock) /* in: record lock */
|
|
|
|
{
|
|
|
|
ut_ad((lock->trx)->wait_lock == lock);
|
|
|
|
ut_ad(lock_get_wait(lock));
|
|
|
|
|
|
|
|
/* Reset the back pointer in trx to this waiting lock request */
|
|
|
|
|
|
|
|
(lock->trx)->wait_lock = NULL;
|
2006-10-26 13:05:45 +00:00
|
|
|
lock->type_mode &= ~LOCK_WAIT;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the gap flag of a record lock. */
|
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
lock_rec_get_gap(
|
|
|
|
/*=============*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: TRUE if gap flag set */
|
|
|
|
const lock_t* lock) /* in: record lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(lock);
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock->type_mode & LOCK_GAP) {
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the LOCK_REC_NOT_GAP flag of a record lock. */
|
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
lock_rec_get_rec_not_gap(
|
|
|
|
/*=====================*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: TRUE if LOCK_REC_NOT_GAP flag set */
|
|
|
|
const lock_t* lock) /* in: record lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(lock);
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock->type_mode & LOCK_REC_NOT_GAP) {
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the waiting insert flag of a record lock. */
|
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
lock_rec_get_insert_intention(
|
|
|
|
/*==========================*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: TRUE if gap flag set */
|
|
|
|
const lock_t* lock) /* in: record lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(lock);
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock->type_mode & LOCK_INSERT_INTENTION) {
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Calculates if lock mode 1 is stronger or equal to lock mode 2. */
|
|
|
|
UNIV_INLINE
|
2007-02-01 20:56:23 +00:00
|
|
|
ulint
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mode_stronger_or_eq(
|
|
|
|
/*=====================*/
|
2007-02-01 20:56:23 +00:00
|
|
|
/* out: nonzero
|
|
|
|
if mode1 stronger or equal to mode2 */
|
|
|
|
enum lock_mode mode1, /* in: lock mode */
|
|
|
|
enum lock_mode mode2) /* in: lock mode */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(mode1 == LOCK_X || mode1 == LOCK_S || mode1 == LOCK_IX
|
2006-08-29 09:30:31 +00:00
|
|
|
|| mode1 == LOCK_IS || mode1 == LOCK_AUTO_INC);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mode2 == LOCK_X || mode2 == LOCK_S || mode2 == LOCK_IX
|
2006-08-29 09:30:31 +00:00
|
|
|
|| mode2 == LOCK_IS || mode2 == LOCK_AUTO_INC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-02-01 20:56:23 +00:00
|
|
|
return((LOCK_MODE_STRONGER_OR_EQ) & LK(mode1, mode2));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Calculates if lock mode 1 is compatible with lock mode 2. */
|
|
|
|
UNIV_INLINE
|
2007-02-01 20:56:23 +00:00
|
|
|
ulint
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mode_compatible(
|
|
|
|
/*=================*/
|
2007-02-01 20:56:23 +00:00
|
|
|
/* out: nonzero if mode1 compatible with mode2 */
|
|
|
|
enum lock_mode mode1, /* in: lock mode */
|
|
|
|
enum lock_mode mode2) /* in: lock mode */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(mode1 == LOCK_X || mode1 == LOCK_S || mode1 == LOCK_IX
|
2006-08-29 09:30:31 +00:00
|
|
|
|| mode1 == LOCK_IS || mode1 == LOCK_AUTO_INC);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mode2 == LOCK_X || mode2 == LOCK_S || mode2 == LOCK_IX
|
2006-08-29 09:30:31 +00:00
|
|
|
|| mode2 == LOCK_IS || mode2 == LOCK_AUTO_INC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-02-01 20:56:23 +00:00
|
|
|
return((LOCK_MODE_COMPATIBILITY) & LK(mode1, mode2));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if a lock request for a new lock has to wait for request lock2. */
|
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
lock_rec_has_to_wait(
|
|
|
|
/*=================*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: TRUE if new lock has to wait
|
|
|
|
for lock2 to be removed */
|
|
|
|
const trx_t* trx, /* in: trx of new lock */
|
|
|
|
ulint type_mode,/* in: precise mode of the new lock
|
|
|
|
to set: LOCK_S or LOCK_X, possibly
|
|
|
|
ORed to LOCK_GAP or LOCK_REC_NOT_GAP,
|
|
|
|
LOCK_INSERT_INTENTION */
|
|
|
|
const lock_t* lock2, /* in: another record lock; NOTE that
|
|
|
|
it is assumed that this has a lock bit
|
|
|
|
set on the same record as in the new
|
|
|
|
lock we are setting */
|
|
|
|
ibool lock_is_on_supremum) /* in: TRUE if we are setting the
|
|
|
|
lock on the 'supremum' record of an
|
|
|
|
index page: we know then that the lock
|
|
|
|
request is really for a 'gap' type lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(trx && lock2);
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock2) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (trx != lock2->trx
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !lock_mode_compatible(LOCK_MODE_MASK & type_mode,
|
|
|
|
lock_get_mode(lock2))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* We have somewhat complex rules when gap type record locks
|
|
|
|
cause waits */
|
|
|
|
|
|
|
|
if ((lock_is_on_supremum || (type_mode & LOCK_GAP))
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !(type_mode & LOCK_INSERT_INTENTION)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Gap type locks without LOCK_INSERT_INTENTION flag
|
2006-02-23 19:25:29 +00:00
|
|
|
do not need to wait for anything. This is because
|
|
|
|
different users can have conflicting lock types
|
2005-10-27 07:29:40 +00:00
|
|
|
on gaps. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(FALSE);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!(type_mode & LOCK_INSERT_INTENTION)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& lock_rec_get_gap(lock2)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Record lock (LOCK_ORDINARY or LOCK_REC_NOT_GAP
|
|
|
|
does not need to wait for a gap type lock */
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((type_mode & LOCK_GAP)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& lock_rec_get_rec_not_gap(lock2)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Lock on gap does not need to wait for
|
|
|
|
a LOCK_REC_NOT_GAP type lock */
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock_rec_get_insert_intention(lock2)) {
|
|
|
|
|
|
|
|
/* No lock request needs to wait for an insert
|
|
|
|
intention lock to be removed. This is ok since our
|
|
|
|
rules allow conflicting locks on gaps. This eliminates
|
|
|
|
a spurious deadlock caused by a next-key lock waiting
|
|
|
|
for an insert intention lock; when the insert
|
|
|
|
intention lock was granted, the insert deadlocked on
|
|
|
|
the waiting next-key lock.
|
|
|
|
|
|
|
|
Also, insert intention locks do not disturb each
|
|
|
|
other. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if a lock request lock1 has to wait for request lock2. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_has_to_wait(
|
|
|
|
/*=============*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: TRUE if lock1 has to wait for
|
|
|
|
lock2 to be removed */
|
|
|
|
const lock_t* lock1, /* in: waiting lock */
|
|
|
|
const lock_t* lock2) /* in: another lock; NOTE that it is
|
|
|
|
assumed that this has a lock bit set
|
|
|
|
on the same record as in lock1 if the
|
|
|
|
locks are record locks */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(lock1 && lock2);
|
|
|
|
|
|
|
|
if (lock1->trx != lock2->trx
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !lock_mode_compatible(lock_get_mode(lock1),
|
|
|
|
lock_get_mode(lock2))) {
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock1) == LOCK_REC) {
|
|
|
|
ut_ad(lock_get_type_low(lock2) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* If this lock request is for a supremum record
|
|
|
|
then the second bit on the lock bitmap is set */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(lock_rec_has_to_wait(lock1->trx,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock1->type_mode, lock2,
|
2006-09-19 10:14:07 +00:00
|
|
|
lock_rec_get_nth_bit(
|
|
|
|
lock1, 1)));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*============== RECORD LOCK BASIC FUNCTIONS ============================*/
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the number of bits in a record lock bitmap. */
|
|
|
|
UNIV_INLINE
|
|
|
|
ulint
|
|
|
|
lock_rec_get_n_bits(
|
|
|
|
/*================*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: number of bits */
|
|
|
|
const lock_t* lock) /* in: record lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
return(lock->un_member.rec_lock.n_bits);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
Sets the nth bit of a record lock to TRUE. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
lock_rec_set_nth_bit(
|
2006-02-23 19:25:29 +00:00
|
|
|
/*=================*/
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_t* lock, /* in: record lock */
|
|
|
|
ulint i) /* in: index of the bit */
|
|
|
|
{
|
|
|
|
ulint byte_index;
|
|
|
|
ulint bit_index;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(lock);
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(i < lock->un_member.rec_lock.n_bits);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
byte_index = i / 8;
|
|
|
|
bit_index = i % 8;
|
|
|
|
|
2007-01-22 08:48:00 +00:00
|
|
|
((byte*) &lock[1])[byte_index] |= 1 << bit_index;
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
Looks for a set bit in a record lock bitmap. Returns ULINT_UNDEFINED,
|
|
|
|
if none found. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_rec_find_set_bit(
|
|
|
|
/*==================*/
|
2006-10-26 13:05:45 +00:00
|
|
|
/* out: bit index == heap number of
|
|
|
|
the record, or ULINT_UNDEFINED if none found */
|
|
|
|
const lock_t* lock) /* in: record lock with at least one bit set */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
for (i = 0; i < lock_rec_get_n_bits(lock); i++) {
|
|
|
|
|
|
|
|
if (lock_rec_get_nth_bit(lock, i)) {
|
|
|
|
|
|
|
|
return(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(ULINT_UNDEFINED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
Resets the nth bit of a record lock. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
lock_rec_reset_nth_bit(
|
|
|
|
/*===================*/
|
|
|
|
lock_t* lock, /* in: record lock */
|
|
|
|
ulint i) /* in: index of the bit which must be set to TRUE
|
|
|
|
when this function is called */
|
|
|
|
{
|
|
|
|
ulint byte_index;
|
|
|
|
ulint bit_index;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(lock);
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(i < lock->un_member.rec_lock.n_bits);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
byte_index = i / 8;
|
|
|
|
bit_index = i % 8;
|
|
|
|
|
2007-01-22 08:48:00 +00:00
|
|
|
((byte*) &lock[1])[byte_index] &= ~(1 << bit_index);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the first or next record lock on a page. */
|
|
|
|
UNIV_INLINE
|
|
|
|
lock_t*
|
|
|
|
lock_rec_get_next_on_page(
|
|
|
|
/*======================*/
|
|
|
|
/* out: next lock, NULL if none exists */
|
|
|
|
lock_t* lock) /* in: a record lock */
|
|
|
|
{
|
|
|
|
ulint space;
|
|
|
|
ulint page_no;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
space = lock->un_member.rec_lock.space;
|
|
|
|
page_no = lock->un_member.rec_lock.page_no;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
for (;;) {
|
|
|
|
lock = HASH_GET_NEXT(hash, lock);
|
|
|
|
|
|
|
|
if (!lock) {
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
if ((lock->un_member.rec_lock.space == space)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& (lock->un_member.rec_lock.page_no == page_no)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the first record lock on a page, where the page is identified by its
|
|
|
|
file address. */
|
|
|
|
UNIV_INLINE
|
|
|
|
lock_t*
|
|
|
|
lock_rec_get_first_on_page_addr(
|
|
|
|
/*============================*/
|
|
|
|
/* out: first lock, NULL if none exists */
|
|
|
|
ulint space, /* in: space */
|
|
|
|
ulint page_no)/* in: page number */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
lock = HASH_GET_FIRST(lock_sys->rec_hash,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock_rec_hash(space, page_no));
|
2005-10-27 07:29:40 +00:00
|
|
|
while (lock) {
|
2006-02-23 19:25:29 +00:00
|
|
|
if ((lock->un_member.rec_lock.space == space)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& (lock->un_member.rec_lock.page_no == page_no)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = HASH_GET_NEXT(hash, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(lock);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*************************************************************************
|
|
|
|
Returns TRUE if there are explicit record locks on a page. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_rec_expl_exist_on_page(
|
|
|
|
/*========================*/
|
|
|
|
/* out: TRUE if there are explicit record locks on
|
|
|
|
the page */
|
|
|
|
ulint space, /* in: space id */
|
|
|
|
ulint page_no)/* in: page number */
|
|
|
|
{
|
|
|
|
ibool ret;
|
|
|
|
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
|
|
|
|
if (lock_rec_get_first_on_page_addr(space, page_no)) {
|
|
|
|
ret = TRUE;
|
|
|
|
} else {
|
|
|
|
ret = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_exit(&kernel_mutex);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the first record lock on a page, where the page is identified by a
|
|
|
|
pointer to it. */
|
|
|
|
UNIV_INLINE
|
|
|
|
lock_t*
|
|
|
|
lock_rec_get_first_on_page(
|
|
|
|
/*=======================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: first lock, NULL if
|
|
|
|
none exists */
|
|
|
|
const buf_block_t* block) /* in: buffer block */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint hash;
|
|
|
|
lock_t* lock;
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint space = buf_block_get_space(block);
|
|
|
|
ulint page_no = buf_block_get_page_no(block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
hash = buf_block_get_lock_hash_val(block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock = HASH_GET_FIRST(lock_sys->rec_hash, hash);
|
|
|
|
|
|
|
|
while (lock) {
|
2006-02-23 19:25:29 +00:00
|
|
|
if ((lock->un_member.rec_lock.space == space)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& (lock->un_member.rec_lock.page_no == page_no)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = HASH_GET_NEXT(hash, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the next explicit lock request on a record. */
|
|
|
|
UNIV_INLINE
|
|
|
|
lock_t*
|
|
|
|
lock_rec_get_next(
|
|
|
|
/*==============*/
|
|
|
|
/* out: next lock, NULL if none exists */
|
2005-10-27 11:48:10 +00:00
|
|
|
ulint heap_no,/* in: heap number of the record */
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_t* lock) /* in: lock */
|
|
|
|
{
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
do {
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_next_on_page(lock);
|
|
|
|
} while (lock && !lock_rec_get_nth_bit(lock, heap_no));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the first explicit lock request on a record. */
|
|
|
|
UNIV_INLINE
|
|
|
|
lock_t*
|
|
|
|
lock_rec_get_first(
|
|
|
|
/*===============*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: first lock, NULL if
|
|
|
|
none exists */
|
|
|
|
const buf_block_t* block, /* in: block containing the record */
|
|
|
|
ulint heap_no)/* in: heap number of the record */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2008-02-15 14:16:27 +00:00
|
|
|
for (lock = lock_rec_get_first_on_page(block); lock;
|
|
|
|
lock = lock_rec_get_next_on_page(lock)) {
|
|
|
|
if (lock_rec_get_nth_bit(lock, heap_no)) {
|
|
|
|
break;
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Resets the record lock bitmap to zero. NOTE: does not touch the wait_lock
|
|
|
|
pointer in the transaction! This function is used in lock object creation
|
|
|
|
and resetting. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_rec_bitmap_reset(
|
|
|
|
/*==================*/
|
|
|
|
lock_t* lock) /* in: record lock */
|
|
|
|
{
|
|
|
|
ulint n_bytes;
|
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Reset to zero the bitmap which resides immediately after the lock
|
|
|
|
struct */
|
|
|
|
|
|
|
|
n_bytes = lock_rec_get_n_bits(lock) / 8;
|
|
|
|
|
|
|
|
ut_ad((lock_rec_get_n_bits(lock) % 8) == 0);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-01-22 08:48:00 +00:00
|
|
|
memset(&lock[1], 0, n_bytes);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Copies a record lock to heap. */
|
|
|
|
static
|
|
|
|
lock_t*
|
|
|
|
lock_rec_copy(
|
|
|
|
/*==========*/
|
|
|
|
/* out: copy of lock */
|
2006-10-26 13:05:45 +00:00
|
|
|
const lock_t* lock, /* in: record lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
mem_heap_t* heap) /* in: memory heap */
|
|
|
|
{
|
|
|
|
ulint size;
|
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
size = sizeof(lock_t) + lock_rec_get_n_bits(lock) / 8;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2008-02-15 14:16:27 +00:00
|
|
|
return(mem_heap_dup(heap, lock, size));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Gets the previous record lock set on a record. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-08-01 07:49:43 +00:00
|
|
|
const lock_t*
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_get_prev(
|
|
|
|
/*==============*/
|
2007-08-01 07:49:43 +00:00
|
|
|
/* out: previous lock on the same
|
|
|
|
record, NULL if none exists */
|
|
|
|
const lock_t* in_lock,/* in: record lock */
|
|
|
|
ulint heap_no)/* in: heap number of the record */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2007-10-03 12:22:29 +00:00
|
|
|
lock_t* lock;
|
|
|
|
ulint space;
|
|
|
|
ulint page_no;
|
|
|
|
lock_t* found_lock = NULL;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(in_lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
space = in_lock->un_member.rec_lock.space;
|
|
|
|
page_no = in_lock->un_member.rec_lock.page_no;
|
|
|
|
|
|
|
|
lock = lock_rec_get_first_on_page_addr(space, page_no);
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
ut_ad(lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (lock == in_lock) {
|
|
|
|
|
|
|
|
return(found_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock_rec_get_nth_bit(lock, heap_no)) {
|
|
|
|
|
|
|
|
found_lock = lock;
|
|
|
|
}
|
|
|
|
|
2007-10-03 12:22:29 +00:00
|
|
|
lock = lock_rec_get_next_on_page(lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*============= FUNCTIONS FOR ANALYZING TABLE LOCK QUEUE ================*/
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if a transaction has the specified table lock, or stronger. */
|
|
|
|
UNIV_INLINE
|
|
|
|
lock_t*
|
|
|
|
lock_table_has(
|
|
|
|
/*===========*/
|
|
|
|
/* out: lock or NULL */
|
|
|
|
trx_t* trx, /* in: transaction */
|
|
|
|
dict_table_t* table, /* in: table */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode mode) /* in: lock mode */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
/* Look for stronger locks the same trx already has on the table */
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_LAST(table->locks);
|
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
|
|
|
|
if (lock->trx == trx
|
2006-08-29 09:30:31 +00:00
|
|
|
&& lock_mode_stronger_or_eq(lock_get_mode(lock), mode)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
/* The same trx already has locked the table in
|
2005-10-27 07:29:40 +00:00
|
|
|
a mode stronger or equal to the mode given */
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
ut_ad(!lock_get_wait(lock));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_PREV(un_member.tab_lock.locks, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*============= FUNCTIONS FOR ANALYZING RECORD LOCK QUEUE ================*/
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if a transaction has a GRANTED explicit lock on rec stronger or equal
|
|
|
|
to precise_mode. */
|
|
|
|
UNIV_INLINE
|
|
|
|
lock_t*
|
|
|
|
lock_rec_has_expl(
|
|
|
|
/*==============*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: lock or NULL */
|
|
|
|
ulint precise_mode,/* in: LOCK_S or LOCK_X
|
|
|
|
possibly ORed to LOCK_GAP or
|
|
|
|
LOCK_REC_NOT_GAP, for a
|
|
|
|
supremum record we regard this
|
|
|
|
always a gap type request */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
|
|
|
ulint heap_no,/* in: heap number of the record */
|
|
|
|
trx_t* trx) /* in: transaction */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
ut_ad((precise_mode & LOCK_MODE_MASK) == LOCK_S
|
2006-08-29 09:30:31 +00:00
|
|
|
|| (precise_mode & LOCK_MODE_MASK) == LOCK_X);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(!(precise_mode & LOCK_INSERT_INTENTION));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
while (lock) {
|
|
|
|
if (lock->trx == trx
|
2006-08-29 09:30:31 +00:00
|
|
|
&& lock_mode_stronger_or_eq(lock_get_mode(lock),
|
|
|
|
precise_mode & LOCK_MODE_MASK)
|
|
|
|
&& !lock_get_wait(lock)
|
|
|
|
&& (!lock_rec_get_rec_not_gap(lock)
|
|
|
|
|| (precise_mode & LOCK_REC_NOT_GAP)
|
2006-10-24 06:45:52 +00:00
|
|
|
|| heap_no == PAGE_HEAP_NO_SUPREMUM)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& (!lock_rec_get_gap(lock)
|
|
|
|
|| (precise_mode & LOCK_GAP)
|
2006-10-24 06:45:52 +00:00
|
|
|
|| heap_no == PAGE_HEAP_NO_SUPREMUM)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& (!lock_rec_get_insert_intention(lock))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
return(lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
# ifndef UNIV_HOTBACKUP
|
2005-10-27 07:29:40 +00:00
|
|
|
/*************************************************************************
|
|
|
|
Checks if some other transaction has a lock request in the queue. */
|
|
|
|
static
|
|
|
|
lock_t*
|
|
|
|
lock_rec_other_has_expl_req(
|
|
|
|
/*========================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: lock or NULL */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode mode, /* in: LOCK_S or LOCK_X */
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint gap, /* in: LOCK_GAP if also gap
|
|
|
|
locks are taken into account,
|
|
|
|
or 0 if not */
|
|
|
|
ulint wait, /* in: LOCK_WAIT if also
|
|
|
|
waiting locks are taken into
|
|
|
|
account, or 0 if not */
|
2008-02-15 13:03:12 +00:00
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no,/* in: heap number of the record */
|
2008-02-15 13:03:12 +00:00
|
|
|
const trx_t* trx) /* in: transaction, or NULL if
|
2006-10-24 06:45:52 +00:00
|
|
|
requests by all transactions
|
|
|
|
are taken into account */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
ut_ad(mode == LOCK_X || mode == LOCK_S);
|
|
|
|
ut_ad(gap == 0 || gap == LOCK_GAP);
|
|
|
|
ut_ad(wait == 0 || wait == LOCK_WAIT);
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
while (lock) {
|
|
|
|
if (lock->trx != trx
|
2006-08-29 09:30:31 +00:00
|
|
|
&& (gap
|
|
|
|
|| !(lock_rec_get_gap(lock)
|
2006-10-24 06:45:52 +00:00
|
|
|
|| heap_no == PAGE_HEAP_NO_SUPREMUM))
|
2006-08-29 09:30:31 +00:00
|
|
|
&& (wait || !lock_get_wait(lock))
|
|
|
|
&& lock_mode_stronger_or_eq(lock_get_mode(lock), mode)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
return(lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
2006-10-24 06:45:52 +00:00
|
|
|
# endif /* !UNIV_HOTBACKUP */
|
|
|
|
#endif /* UNIV_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if some other transaction has a conflicting explicit lock request
|
|
|
|
in the queue, so that we have to wait. */
|
|
|
|
static
|
|
|
|
lock_t*
|
|
|
|
lock_rec_other_has_conflicting(
|
|
|
|
/*===========================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: lock or NULL */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode mode, /* in: LOCK_S or LOCK_X,
|
2006-10-24 06:45:52 +00:00
|
|
|
possibly ORed to LOCK_GAP or
|
|
|
|
LOC_REC_NOT_GAP,
|
|
|
|
LOCK_INSERT_INTENTION */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
|
|
|
ulint heap_no,/* in: heap number of the record */
|
|
|
|
trx_t* trx) /* in: our transaction */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2007-01-18 18:29:12 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
if (UNIV_LIKELY_NULL(lock)) {
|
2006-10-24 06:45:52 +00:00
|
|
|
if (UNIV_UNLIKELY(heap_no == PAGE_HEAP_NO_SUPREMUM)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
do {
|
|
|
|
if (lock_rec_has_to_wait(trx, mode, lock,
|
2006-08-29 09:30:31 +00:00
|
|
|
TRUE)) {
|
2005-10-27 11:48:10 +00:00
|
|
|
return(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
|
|
|
} while (lock);
|
|
|
|
} else {
|
|
|
|
|
|
|
|
do {
|
|
|
|
if (lock_rec_has_to_wait(trx, mode, lock,
|
2006-08-29 09:30:31 +00:00
|
|
|
FALSE)) {
|
2005-10-27 11:48:10 +00:00
|
|
|
return(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
|
|
|
} while (lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Looks for a suitable type record lock struct by the same trx on the same page.
|
|
|
|
This can be used to save space when a new record lock should be set on a page:
|
|
|
|
no new struct is needed, if a suitable old is found. */
|
|
|
|
UNIV_INLINE
|
|
|
|
lock_t*
|
|
|
|
lock_rec_find_similar_on_page(
|
|
|
|
/*==========================*/
|
2008-02-15 14:16:27 +00:00
|
|
|
/* out: lock or NULL */
|
|
|
|
ulint type_mode, /* in: lock type_mode field */
|
|
|
|
ulint heap_no, /* in: heap number of the record */
|
|
|
|
lock_t* lock, /* in: lock_rec_get_first_on_page() */
|
|
|
|
const trx_t* trx) /* in: transaction */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
if (lock->trx == trx
|
2006-08-29 09:30:31 +00:00
|
|
|
&& lock->type_mode == type_mode
|
|
|
|
&& lock_rec_get_n_bits(lock) > heap_no) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(lock);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock = lock_rec_get_next_on_page(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if some transaction has an implicit x-lock on a record in a secondary
|
|
|
|
index. */
|
2007-11-27 09:20:40 +00:00
|
|
|
static
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_t*
|
|
|
|
lock_sec_rec_some_has_impl_off_kernel(
|
|
|
|
/*==================================*/
|
|
|
|
/* out: transaction which has the x-lock, or
|
|
|
|
NULL */
|
2006-10-24 06:45:52 +00:00
|
|
|
const rec_t* rec, /* in: user record */
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_t* index, /* in: secondary index */
|
|
|
|
const ulint* offsets)/* in: rec_get_offsets(rec, index) */
|
|
|
|
{
|
2007-10-03 12:22:29 +00:00
|
|
|
const page_t* page = page_align(rec);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2006-03-09 17:26:02 +00:00
|
|
|
ut_ad(!dict_index_is_clust(index));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(page_rec_is_user_rec(rec));
|
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
|
|
|
|
/* Some transaction may have an implicit x-lock on the record only
|
|
|
|
if the max trx id for the page >= min trx id for the trx list, or
|
|
|
|
database recovery is running. We do not write the changes of a page
|
|
|
|
max trx id to the log, and therefore during recovery, this value
|
|
|
|
for a page may be incorrect. */
|
|
|
|
|
|
|
|
if (!(ut_dulint_cmp(page_get_max_trx_id(page),
|
2006-08-29 09:30:31 +00:00
|
|
|
trx_list_get_min_trx_id()) >= 0)
|
|
|
|
&& !recv_recovery_is_on()) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ok, in this case it is possible that some transaction has an
|
|
|
|
implicit x-lock. We have to look in the clustered index. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!lock_check_trx_id_sanity(page_get_max_trx_id(page),
|
2006-08-29 09:30:31 +00:00
|
|
|
rec, index, offsets, TRUE)) {
|
2006-05-02 11:44:39 +00:00
|
|
|
buf_page_print(page, 0);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* The page is corrupt: try to avoid a crash by returning
|
|
|
|
NULL */
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(row_vers_impl_x_locked_off_kernel(rec, index, offsets));
|
|
|
|
}
|
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
/*************************************************************************
|
|
|
|
Return approximate number or record locks (bits set in the bitmap) for
|
|
|
|
this transaction. Since delete-marked records may be removed, the
|
|
|
|
record count will not be precise. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2006-04-12 09:32:17 +00:00
|
|
|
ulint
|
|
|
|
lock_number_of_rows_locked(
|
|
|
|
/*=======================*/
|
|
|
|
trx_t* trx) /* in: transaction */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
ulint n_records = 0;
|
|
|
|
ulint n_bits;
|
|
|
|
ulint n_bit;
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_FIRST(trx->trx_locks);
|
|
|
|
|
|
|
|
while (lock) {
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock) == LOCK_REC) {
|
2006-04-12 09:32:17 +00:00
|
|
|
n_bits = lock_rec_get_n_bits(lock);
|
|
|
|
|
|
|
|
for (n_bit = 0; n_bit < n_bits; n_bit++) {
|
|
|
|
if (lock_rec_get_nth_bit(lock, n_bit)) {
|
|
|
|
n_records++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_NEXT(trx_locks, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (n_records);
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*============== RECORD LOCK CREATION AND QUEUE MANAGEMENT =============*/
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Creates a new record lock and inserts it to the lock queue. Does NOT check
|
|
|
|
for deadlocks or lock compatibility! */
|
|
|
|
static
|
|
|
|
lock_t*
|
|
|
|
lock_rec_create(
|
|
|
|
/*============*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: created lock */
|
|
|
|
ulint type_mode,/* in: lock mode and wait
|
|
|
|
flag, type is ignored and
|
|
|
|
replaced by LOCK_REC */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
|
|
|
ulint heap_no,/* in: heap number of the record */
|
|
|
|
dict_index_t* index, /* in: index of record */
|
|
|
|
trx_t* trx) /* in: transaction */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_t* lock;
|
|
|
|
ulint page_no;
|
|
|
|
ulint space;
|
|
|
|
ulint n_bits;
|
|
|
|
ulint n_bytes;
|
|
|
|
const page_t* page;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
space = buf_block_get_space(block);
|
|
|
|
page_no = buf_block_get_page_no(block);
|
|
|
|
page = block->frame;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-27 09:33:26 +00:00
|
|
|
ut_ad(!!page_is_comp(page) == dict_table_is_comp(index->table));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* If rec is the supremum record, then we reset the gap and
|
|
|
|
LOCK_REC_NOT_GAP bits, as all locks on the supremum are
|
|
|
|
automatically of the gap type */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (UNIV_UNLIKELY(heap_no == PAGE_HEAP_NO_SUPREMUM)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(!(type_mode & LOCK_REC_NOT_GAP));
|
|
|
|
|
|
|
|
type_mode = type_mode & ~(LOCK_GAP | LOCK_REC_NOT_GAP);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make lock bitmap bigger by a safety margin */
|
|
|
|
n_bits = page_dir_get_n_heap(page) + LOCK_PAGE_BITMAP_MARGIN;
|
|
|
|
n_bytes = 1 + n_bits / 8;
|
|
|
|
|
|
|
|
lock = mem_heap_alloc(trx->lock_heap, sizeof(lock_t) + n_bytes);
|
|
|
|
|
|
|
|
UT_LIST_ADD_LAST(trx_locks, trx->trx_locks, lock);
|
|
|
|
|
|
|
|
lock->trx = trx;
|
|
|
|
|
|
|
|
lock->type_mode = (type_mode & ~LOCK_TYPE_MASK) | LOCK_REC;
|
|
|
|
lock->index = index;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock->un_member.rec_lock.space = space;
|
|
|
|
lock->un_member.rec_lock.page_no = page_no;
|
|
|
|
lock->un_member.rec_lock.n_bits = n_bytes * 8;
|
|
|
|
|
|
|
|
/* Reset to zero the bitmap which resides immediately after the
|
|
|
|
lock struct */
|
|
|
|
|
|
|
|
lock_rec_bitmap_reset(lock);
|
|
|
|
|
|
|
|
/* Set the bit corresponding to rec */
|
|
|
|
lock_rec_set_nth_bit(lock, heap_no);
|
|
|
|
|
|
|
|
HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock_rec_fold(space, page_no), lock);
|
2007-01-23 10:02:02 +00:00
|
|
|
if (UNIV_UNLIKELY(type_mode & LOCK_WAIT)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_set_lock_and_trx_wait(lock, trx);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Enqueues a waiting request for a lock which cannot be granted immediately.
|
|
|
|
Checks for deadlocks. */
|
|
|
|
static
|
|
|
|
ulint
|
|
|
|
lock_rec_enqueue_waiting(
|
|
|
|
/*=====================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: DB_LOCK_WAIT,
|
|
|
|
DB_DEADLOCK, or
|
|
|
|
DB_QUE_THR_SUSPENDED, or
|
|
|
|
DB_SUCCESS; DB_SUCCESS means
|
|
|
|
that there was a deadlock, but
|
|
|
|
another transaction was chosen
|
|
|
|
as a victim, and we got the
|
|
|
|
lock immediately: no need to
|
|
|
|
wait then */
|
|
|
|
ulint type_mode,/* in: lock mode this
|
|
|
|
transaction is requesting:
|
|
|
|
LOCK_S or LOCK_X, possibly
|
|
|
|
ORed with LOCK_GAP or
|
|
|
|
LOCK_REC_NOT_GAP, ORed with
|
|
|
|
LOCK_INSERT_INTENTION if this
|
|
|
|
waiting lock request is set
|
|
|
|
when performing an insert of
|
|
|
|
an index record */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
|
|
|
ulint heap_no,/* in: heap number of the record */
|
|
|
|
dict_index_t* index, /* in: index of record */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
trx_t* trx;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
/* Test if there already is some other reason to suspend thread:
|
|
|
|
we do not enqueue a lock request if the query thread should be
|
|
|
|
stopped anyway */
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
if (UNIV_UNLIKELY(que_thr_stop(thr))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_error;
|
|
|
|
|
|
|
|
return(DB_QUE_THR_SUSPENDED);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
|
2007-10-19 10:52:25 +00:00
|
|
|
switch (trx_get_dict_operation(trx)) {
|
|
|
|
case TRX_DICT_OP_NONE:
|
|
|
|
break;
|
|
|
|
case TRX_DICT_OP_TABLE:
|
|
|
|
case TRX_DICT_OP_INDEX:
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_print_timestamp(stderr);
|
2006-08-29 09:30:31 +00:00
|
|
|
fputs(" InnoDB: Error: a record lock wait happens"
|
|
|
|
" in a dictionary operation!\n"
|
2007-09-05 08:57:59 +00:00
|
|
|
"InnoDB: ", stderr);
|
|
|
|
dict_index_name_print(stderr, trx, index);
|
2005-10-27 07:29:40 +00:00
|
|
|
fputs(".\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Submit a detailed bug report"
|
|
|
|
" to http://bugs.mysql.com\n",
|
|
|
|
stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2005-10-27 11:48:10 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Enqueue the lock request that will wait to be granted */
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_create(type_mode | LOCK_WAIT,
|
|
|
|
block, heap_no, index, trx);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Check if a deadlock occurs: if yes, remove the lock request and
|
|
|
|
return an error code */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
if (UNIV_UNLIKELY(lock_deadlock_occurs(lock, trx))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_reset_lock_and_trx_wait(lock);
|
2005-10-27 11:48:10 +00:00
|
|
|
lock_rec_reset_nth_bit(lock, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(DB_DEADLOCK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If there was a deadlock but we chose another transaction as a
|
|
|
|
victim, it is possible that we already have the lock now granted! */
|
|
|
|
|
|
|
|
if (trx->wait_lock == NULL) {
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
trx->que_state = TRX_QUE_LOCK_WAIT;
|
|
|
|
trx->was_chosen_as_deadlock_victim = FALSE;
|
|
|
|
trx->wait_started = time(NULL);
|
|
|
|
|
|
|
|
ut_a(que_thr_stop(thr));
|
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (lock_print_waits) {
|
|
|
|
fprintf(stderr, "Lock wait for trx %lu in index ",
|
|
|
|
(ulong) ut_dulint_get_low(trx->id));
|
2006-06-13 20:23:26 +00:00
|
|
|
ut_print_name(stderr, trx, FALSE, index->name);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
|
|
|
return(DB_LOCK_WAIT);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Adds a record lock request in the record queue. The request is normally
|
|
|
|
added as the last in the queue, but if there are no waiting lock requests
|
|
|
|
on the record, and the request to be added is not a waiting request, we
|
|
|
|
can reuse a suitable record lock object already existing on the same page,
|
|
|
|
just setting the appropriate bit in its bitmap. This is a low-level function
|
|
|
|
which does NOT check for deadlocks or lock compatibility! */
|
|
|
|
static
|
|
|
|
lock_t*
|
|
|
|
lock_rec_add_to_queue(
|
|
|
|
/*==================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: lock where the bit was set */
|
|
|
|
ulint type_mode,/* in: lock mode, wait, gap
|
|
|
|
etc. flags; type is ignored
|
|
|
|
and replaced by LOCK_REC */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
|
|
|
ulint heap_no,/* in: heap number of the record */
|
|
|
|
dict_index_t* index, /* in: index of record */
|
|
|
|
trx_t* trx) /* in: transaction */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2008-02-15 11:38:21 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
switch (type_mode & LOCK_MODE_MASK) {
|
|
|
|
case LOCK_X:
|
|
|
|
case LOCK_S:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(type_mode & (LOCK_WAIT | LOCK_GAP))) {
|
|
|
|
enum lock_mode mode = (type_mode & LOCK_MODE_MASK) == LOCK_S
|
|
|
|
? LOCK_X
|
|
|
|
: LOCK_S;
|
|
|
|
lock_t* other_lock
|
|
|
|
= lock_rec_other_has_expl_req(mode, 0, LOCK_WAIT,
|
|
|
|
block, heap_no, trx);
|
|
|
|
ut_a(!other_lock);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
type_mode |= LOCK_REC;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* If rec is the supremum record, then we can reset the gap bit, as
|
|
|
|
all locks on the supremum are automatically of the gap type, and we
|
|
|
|
try to avoid unnecessary memory consumption of a new record lock
|
|
|
|
struct for a gap type lock */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (UNIV_UNLIKELY(heap_no == PAGE_HEAP_NO_SUPREMUM)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(!(type_mode & LOCK_REC_NOT_GAP));
|
|
|
|
|
|
|
|
/* There should never be LOCK_REC_NOT_GAP on a supremum
|
|
|
|
record, but let us play safe */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
type_mode = type_mode & ~(LOCK_GAP | LOCK_REC_NOT_GAP);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look for a waiting lock request on the same record or on a gap */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first_on_page(block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
if (lock_get_wait(lock)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& (lock_rec_get_nth_bit(lock, heap_no))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
goto somebody_waits;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lock = lock_rec_get_next_on_page(lock);
|
|
|
|
}
|
|
|
|
|
2008-02-15 14:16:27 +00:00
|
|
|
if (UNIV_LIKELY(!(type_mode & LOCK_WAIT))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
/* Look for a similar record lock on the same page:
|
|
|
|
if one is found and there are no waiting lock requests,
|
|
|
|
we can just set the bit */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
lock = lock_rec_find_similar_on_page(
|
|
|
|
type_mode, heap_no,
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_get_first_on_page(block), trx);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
if (lock) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock_rec_set_nth_bit(lock, heap_no);
|
|
|
|
|
|
|
|
return(lock);
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
somebody_waits:
|
2006-10-24 06:45:52 +00:00
|
|
|
return(lock_rec_create(type_mode, block, heap_no, index, trx));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
This is a fast routine for locking a record in the most common cases:
|
|
|
|
there are no explicit locks on the page, or there is just one lock, owned
|
|
|
|
by this transaction, and of the right type_mode. This is a low-level function
|
|
|
|
which does NOT look at implicit locks! Checks lock compatibility within
|
|
|
|
explicit locks. This function sets a normal next-key lock, or in the case of
|
|
|
|
a page supremum record, a gap type lock. */
|
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
lock_rec_lock_fast(
|
|
|
|
/*===============*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: TRUE if locking succeeded */
|
|
|
|
ibool impl, /* in: if TRUE, no lock is set
|
|
|
|
if no wait is necessary: we
|
|
|
|
assume that the caller will
|
|
|
|
set an implicit lock */
|
|
|
|
ulint mode, /* in: lock mode: LOCK_X or
|
|
|
|
LOCK_S possibly ORed to either
|
|
|
|
LOCK_GAP or LOCK_REC_NOT_GAP */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
|
|
|
ulint heap_no,/* in: heap number of record */
|
|
|
|
dict_index_t* index, /* in: index of record */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2006-02-23 19:25:29 +00:00
|
|
|
trx_t* trx;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
ut_ad((LOCK_MODE_MASK & mode) != LOCK_S
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IS));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad((LOCK_MODE_MASK & mode) != LOCK_X
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IX));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad((LOCK_MODE_MASK & mode) == LOCK_S
|
2006-08-29 09:30:31 +00:00
|
|
|
|| (LOCK_MODE_MASK & mode) == LOCK_X);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mode - (LOCK_MODE_MASK & mode) == LOCK_GAP
|
2006-08-29 09:30:31 +00:00
|
|
|
|| mode - (LOCK_MODE_MASK & mode) == 0
|
|
|
|
|| mode - (LOCK_MODE_MASK & mode) == LOCK_REC_NOT_GAP);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first_on_page(block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
|
|
|
|
if (lock == NULL) {
|
|
|
|
if (!impl) {
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_create(mode, block, heap_no, index, trx);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
if (srv_locks_unsafe_for_binlog
|
2006-08-29 09:30:31 +00:00
|
|
|
|| trx->isolation_level
|
|
|
|
== TRX_ISO_READ_COMMITTED) {
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_register_new_rec_lock(trx, index);
|
|
|
|
}
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(TRUE);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (lock_rec_get_next_on_page(lock)) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock->trx != trx
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock->type_mode != (mode | LOCK_REC)
|
|
|
|
|| lock_rec_get_n_bits(lock) <= heap_no) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
return(FALSE);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!impl) {
|
|
|
|
/* If the nth bit of the record lock is already set then we
|
|
|
|
do not set a new lock bit, otherwise we do set */
|
|
|
|
|
|
|
|
if (!lock_rec_get_nth_bit(lock, heap_no)) {
|
|
|
|
lock_rec_set_nth_bit(lock, heap_no);
|
2006-04-12 09:32:17 +00:00
|
|
|
if (srv_locks_unsafe_for_binlog
|
2006-08-29 09:30:31 +00:00
|
|
|
|| trx->isolation_level
|
|
|
|
== TRX_ISO_READ_COMMITTED) {
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_register_new_rec_lock(trx, index);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
This is the general, and slower, routine for locking a record. This is a
|
|
|
|
low-level function which does NOT look at implicit locks! Checks lock
|
|
|
|
compatibility within explicit locks. This function sets a normal next-key
|
|
|
|
lock, or in the case of a page supremum record, a gap type lock. */
|
|
|
|
static
|
|
|
|
ulint
|
|
|
|
lock_rec_lock_slow(
|
|
|
|
/*===============*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: DB_SUCCESS,
|
|
|
|
DB_LOCK_WAIT, or error code */
|
|
|
|
ibool impl, /* in: if TRUE, no lock is set
|
|
|
|
if no wait is necessary: we
|
|
|
|
assume that the caller will
|
|
|
|
set an implicit lock */
|
|
|
|
ulint mode, /* in: lock mode: LOCK_X or
|
|
|
|
LOCK_S possibly ORed to either
|
|
|
|
LOCK_GAP or LOCK_REC_NOT_GAP */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
|
|
|
ulint heap_no,/* in: heap number of record */
|
|
|
|
dict_index_t* index, /* in: index of record */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
trx_t* trx;
|
|
|
|
ulint err;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
ut_ad((LOCK_MODE_MASK & mode) != LOCK_S
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IS));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad((LOCK_MODE_MASK & mode) != LOCK_X
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IX));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad((LOCK_MODE_MASK & mode) == LOCK_S
|
2006-08-29 09:30:31 +00:00
|
|
|
|| (LOCK_MODE_MASK & mode) == LOCK_X);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mode - (LOCK_MODE_MASK & mode) == LOCK_GAP
|
2006-08-29 09:30:31 +00:00
|
|
|
|| mode - (LOCK_MODE_MASK & mode) == 0
|
|
|
|
|| mode - (LOCK_MODE_MASK & mode) == LOCK_REC_NOT_GAP);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
trx = thr_get_trx(thr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (lock_rec_has_expl(mode, block, heap_no, trx)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* The trx already has a strong enough lock on rec: do
|
|
|
|
nothing */
|
|
|
|
|
|
|
|
err = DB_SUCCESS;
|
2006-10-24 06:45:52 +00:00
|
|
|
} else if (lock_rec_other_has_conflicting(mode, block, heap_no, trx)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* If another transaction has a non-gap conflicting request in
|
|
|
|
the queue, as this transaction does not have a lock strong
|
|
|
|
enough already granted on the record, we have to wait. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
err = lock_rec_enqueue_waiting(mode, block, heap_no,
|
|
|
|
index, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
if (srv_locks_unsafe_for_binlog
|
2006-08-29 09:30:31 +00:00
|
|
|
|| trx->isolation_level == TRX_ISO_READ_COMMITTED) {
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_register_new_rec_lock(trx, index);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (!impl) {
|
|
|
|
/* Set the requested lock on the record */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_add_to_queue(LOCK_REC | mode, block,
|
2006-08-29 09:30:31 +00:00
|
|
|
heap_no, index, trx);
|
2006-04-12 09:32:17 +00:00
|
|
|
if (srv_locks_unsafe_for_binlog
|
2006-08-29 09:30:31 +00:00
|
|
|
|| trx->isolation_level
|
|
|
|
== TRX_ISO_READ_COMMITTED) {
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_register_new_rec_lock(trx, index);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Tries to lock the specified record in the mode requested. If not immediately
|
|
|
|
possible, enqueues a waiting lock request. This is a low-level function
|
|
|
|
which does NOT look at implicit locks! Checks lock compatibility within
|
|
|
|
explicit locks. This function sets a normal next-key lock, or in the case
|
|
|
|
of a page supremum record, a gap type lock. */
|
|
|
|
static
|
|
|
|
ulint
|
|
|
|
lock_rec_lock(
|
|
|
|
/*==========*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: DB_SUCCESS,
|
|
|
|
DB_LOCK_WAIT, or error code */
|
|
|
|
ibool impl, /* in: if TRUE, no lock is set
|
|
|
|
if no wait is necessary: we
|
|
|
|
assume that the caller will
|
|
|
|
set an implicit lock */
|
|
|
|
ulint mode, /* in: lock mode: LOCK_X or
|
|
|
|
LOCK_S possibly ORed to either
|
|
|
|
LOCK_GAP or LOCK_REC_NOT_GAP */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
|
|
|
ulint heap_no,/* in: heap number of record */
|
|
|
|
dict_index_t* index, /* in: index of record */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint err;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
ut_ad((LOCK_MODE_MASK & mode) != LOCK_S
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IS));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad((LOCK_MODE_MASK & mode) != LOCK_X
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IX));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad((LOCK_MODE_MASK & mode) == LOCK_S
|
2006-08-29 09:30:31 +00:00
|
|
|
|| (LOCK_MODE_MASK & mode) == LOCK_X);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mode - (LOCK_MODE_MASK & mode) == LOCK_GAP
|
2006-08-29 09:30:31 +00:00
|
|
|
|| mode - (LOCK_MODE_MASK & mode) == LOCK_REC_NOT_GAP
|
|
|
|
|| mode - (LOCK_MODE_MASK & mode) == 0);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (lock_rec_lock_fast(impl, mode, block, heap_no, index, thr)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* We try a simplified and faster subroutine for the most
|
|
|
|
common cases */
|
|
|
|
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
} else {
|
2006-10-24 06:45:52 +00:00
|
|
|
err = lock_rec_lock_slow(impl, mode, block,
|
|
|
|
heap_no, index, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if a waiting record lock request still has to wait in a queue. */
|
|
|
|
static
|
|
|
|
ibool
|
|
|
|
lock_rec_has_to_wait_in_queue(
|
|
|
|
/*==========================*/
|
|
|
|
/* out: TRUE if still has to wait */
|
|
|
|
lock_t* wait_lock) /* in: waiting record lock */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
ulint space;
|
|
|
|
ulint page_no;
|
|
|
|
ulint heap_no;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2006-02-23 19:25:29 +00:00
|
|
|
ut_ad(lock_get_wait(wait_lock));
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(wait_lock) == LOCK_REC);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
space = wait_lock->un_member.rec_lock.space;
|
|
|
|
page_no = wait_lock->un_member.rec_lock.page_no;
|
|
|
|
heap_no = lock_rec_find_set_bit(wait_lock);
|
|
|
|
|
|
|
|
lock = lock_rec_get_first_on_page_addr(space, page_no);
|
|
|
|
|
|
|
|
while (lock != wait_lock) {
|
|
|
|
|
|
|
|
if (lock_rec_get_nth_bit(lock, heap_no)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& lock_has_to_wait(wait_lock, lock)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
return(TRUE);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lock = lock_rec_get_next_on_page(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Grants a lock to a waiting lock request and releases the waiting
|
|
|
|
transaction. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_grant(
|
|
|
|
/*=======*/
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
lock_t* lock) /* in/out: waiting lock request */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
lock_reset_lock_and_trx_wait(lock);
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
if (lock_get_mode(lock) == LOCK_AUTO_INC) {
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
trx_t* trx = lock->trx;
|
|
|
|
dict_table_t* table = lock->un_member.tab_lock.table;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
if (table->autoinc_trx == trx) {
|
2006-02-23 19:25:29 +00:00
|
|
|
fprintf(stderr,
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Error: trx already had"
|
|
|
|
" an AUTO-INC lock!\n");
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
} else {
|
|
|
|
table->autoinc_trx = trx;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
ib_vector_push(trx->autoinc_locks, lock);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (lock_print_waits) {
|
|
|
|
fprintf(stderr, "Lock wait for trx %lu ends\n",
|
2006-02-23 19:25:29 +00:00
|
|
|
(ulong) ut_dulint_get_low(lock->trx->id));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
/* If we are resolving a deadlock by choosing another transaction
|
|
|
|
as a victim, then our original transaction may not be in the
|
|
|
|
TRX_QUE_LOCK_WAIT state, and there is no need to end the lock wait
|
|
|
|
for it */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
|
|
|
if (lock->trx->que_state == TRX_QUE_LOCK_WAIT) {
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_end_lock_wait(lock->trx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Cancels a waiting record lock request and releases the waiting transaction
|
|
|
|
that requested it. NOTE: does NOT check if waiting lock requests behind this
|
|
|
|
one can now be granted! */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_rec_cancel(
|
|
|
|
/*============*/
|
|
|
|
lock_t* lock) /* in: waiting record lock request */
|
|
|
|
{
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Reset the bit (there can be only one set bit) in the lock bitmap */
|
|
|
|
lock_rec_reset_nth_bit(lock, lock_rec_find_set_bit(lock));
|
|
|
|
|
|
|
|
/* Reset the wait flag and the back pointer to lock in trx */
|
|
|
|
|
|
|
|
lock_reset_lock_and_trx_wait(lock);
|
|
|
|
|
|
|
|
/* The following function releases the trx from lock wait */
|
|
|
|
|
|
|
|
trx_end_lock_wait(lock->trx);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*****************************************************************
|
|
|
|
Removes a record lock request, waiting or granted, from the queue and
|
|
|
|
grants locks to other transactions in the queue if they now are entitled
|
|
|
|
to a lock. NOTE: all record locks contained in in_lock are removed. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_rec_dequeue_from_page(
|
|
|
|
/*=======================*/
|
|
|
|
lock_t* in_lock)/* in: record lock object: all record locks which
|
|
|
|
are contained in this lock object are removed;
|
|
|
|
transactions waiting behind will get their lock
|
|
|
|
requests granted, if they are now qualified to it */
|
|
|
|
{
|
|
|
|
ulint space;
|
|
|
|
ulint page_no;
|
|
|
|
lock_t* lock;
|
|
|
|
trx_t* trx;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(in_lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
trx = in_lock->trx;
|
|
|
|
|
|
|
|
space = in_lock->un_member.rec_lock.space;
|
|
|
|
page_no = in_lock->un_member.rec_lock.page_no;
|
|
|
|
|
|
|
|
HASH_DELETE(lock_t, hash, lock_sys->rec_hash,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock_rec_fold(space, page_no), in_lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
UT_LIST_REMOVE(trx_locks, trx->trx_locks, in_lock);
|
|
|
|
|
|
|
|
/* Check if waiting locks in the queue can now be granted: grant
|
|
|
|
locks if there are no conflicting locks ahead. */
|
|
|
|
|
|
|
|
lock = lock_rec_get_first_on_page_addr(space, page_no);
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
while (lock != NULL) {
|
2005-10-27 07:29:40 +00:00
|
|
|
if (lock_get_wait(lock)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !lock_rec_has_to_wait_in_queue(lock)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Grant the lock */
|
|
|
|
lock_grant(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = lock_rec_get_next_on_page(lock);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Removes a record lock request, waiting or granted, from the queue. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_rec_discard(
|
|
|
|
/*=============*/
|
|
|
|
lock_t* in_lock)/* in: record lock object: all record locks which
|
|
|
|
are contained in this lock object are removed */
|
|
|
|
{
|
|
|
|
ulint space;
|
|
|
|
ulint page_no;
|
|
|
|
trx_t* trx;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(in_lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
trx = in_lock->trx;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
space = in_lock->un_member.rec_lock.space;
|
|
|
|
page_no = in_lock->un_member.rec_lock.page_no;
|
|
|
|
|
|
|
|
HASH_DELETE(lock_t, hash, lock_sys->rec_hash,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock_rec_fold(space, page_no), in_lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
UT_LIST_REMOVE(trx_locks, trx->trx_locks, in_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Removes record lock objects set on an index page which is discarded. This
|
|
|
|
function does not move locks, or check for waiting locks, therefore the
|
|
|
|
lock bitmaps must already be reset when this function is called. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_rec_free_all_from_discard_page(
|
|
|
|
/*================================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block) /* in: page to be discarded */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint space;
|
|
|
|
ulint page_no;
|
|
|
|
lock_t* lock;
|
|
|
|
lock_t* next_lock;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
space = buf_block_get_space(block);
|
|
|
|
page_no = buf_block_get_page_no(block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock = lock_rec_get_first_on_page_addr(space, page_no);
|
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
ut_ad(lock_rec_find_set_bit(lock) == ULINT_UNDEFINED);
|
|
|
|
ut_ad(!lock_get_wait(lock));
|
|
|
|
|
|
|
|
next_lock = lock_rec_get_next_on_page(lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_discard(lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock = next_lock;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*============= RECORD LOCK MOVING AND INHERITING ===================*/
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Resets the lock bits for a single record. Releases transactions waiting for
|
|
|
|
lock requests here. */
|
2006-02-17 14:19:39 +00:00
|
|
|
static
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_rec_reset_and_release_wait(
|
|
|
|
/*============================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block, /* in: buffer block containing
|
|
|
|
the record */
|
|
|
|
ulint heap_no)/* in: heap number of record */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
if (lock_get_wait(lock)) {
|
|
|
|
lock_rec_cancel(lock);
|
|
|
|
} else {
|
|
|
|
lock_rec_reset_nth_bit(lock, heap_no);
|
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Makes a record to inherit the locks (except LOCK_INSERT_INTENTION type)
|
|
|
|
of another record as gap type locks, but does not reset the lock bits of
|
|
|
|
the other record. Also waiting lock requests on rec are inherited as
|
|
|
|
GRANTED gap locks. */
|
2006-10-24 06:45:52 +00:00
|
|
|
static
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_rec_inherit_to_gap(
|
|
|
|
/*====================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* heir_block, /* in: block containing the
|
|
|
|
record which inherits */
|
|
|
|
const buf_block_t* block, /* in: block containing the
|
|
|
|
record from which inherited;
|
|
|
|
does NOT reset the locks on
|
|
|
|
this record */
|
|
|
|
ulint heir_heap_no, /* in: heap_no of the
|
|
|
|
inheriting record */
|
|
|
|
ulint heap_no) /* in: heap_no of the
|
|
|
|
donating record */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2007-01-18 18:29:12 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
/* If srv_locks_unsafe_for_binlog is TRUE or session is using
|
|
|
|
READ COMMITTED isolation level, we do not want locks set
|
2005-10-27 07:29:40 +00:00
|
|
|
by an UPDATE or a DELETE to be inherited as gap type locks. But we
|
|
|
|
DO want S-locks set by a consistency constraint to be inherited also
|
|
|
|
then. */
|
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
if (!lock_rec_get_insert_intention(lock)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !((srv_locks_unsafe_for_binlog
|
|
|
|
|| lock->trx->isolation_level
|
|
|
|
== TRX_ISO_READ_COMMITTED)
|
|
|
|
&& lock_get_mode(lock) == LOCK_X)) {
|
|
|
|
|
|
|
|
lock_rec_add_to_queue(LOCK_REC | LOCK_GAP
|
|
|
|
| lock_get_mode(lock),
|
2006-10-24 06:45:52 +00:00
|
|
|
heir_block, heir_heap_no,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock->index, lock->trx);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Makes a record to inherit the gap locks (except LOCK_INSERT_INTENTION type)
|
|
|
|
of another record as gap type locks, but does not reset the lock bits of the
|
|
|
|
other record. Also waiting lock requests are inherited as GRANTED gap locks. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_rec_inherit_to_gap_if_gap_lock(
|
|
|
|
/*================================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block, /* in: buffer block */
|
|
|
|
ulint heir_heap_no, /* in: heap_no of
|
|
|
|
record which inherits */
|
|
|
|
ulint heap_no) /* in: heap_no of record
|
|
|
|
from which inherited;
|
|
|
|
does NOT reset the locks
|
|
|
|
on this record */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2007-01-18 18:29:12 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
if (!lock_rec_get_insert_intention(lock)
|
2006-10-24 06:45:52 +00:00
|
|
|
&& (heap_no == PAGE_HEAP_NO_SUPREMUM
|
2006-08-29 09:30:31 +00:00
|
|
|
|| !lock_rec_get_rec_not_gap(lock))) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
lock_rec_add_to_queue(LOCK_REC | LOCK_GAP
|
|
|
|
| lock_get_mode(lock),
|
2006-10-24 06:45:52 +00:00
|
|
|
block, heir_heap_no,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock->index, lock->trx);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Moves the locks of a record to another record and resets the lock bits of
|
|
|
|
the donating record. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_rec_move(
|
|
|
|
/*==========*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* receiver, /* in: buffer block containing
|
|
|
|
the receiving record */
|
|
|
|
const buf_block_t* donator, /* in: buffer block containing
|
|
|
|
the donating record */
|
|
|
|
ulint receiver_heap_no,/* in: heap_no of the record
|
|
|
|
which gets the locks; there
|
|
|
|
must be no lock requests
|
|
|
|
on it! */
|
|
|
|
ulint donator_heap_no)/* in: heap_no of the record
|
|
|
|
which gives the locks */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_first(donator, donator_heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
ut_ad(lock_rec_get_first(receiver, receiver_heap_no) == NULL);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
while (lock != NULL) {
|
2007-01-23 10:02:02 +00:00
|
|
|
const ulint type_mode = lock->type_mode;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock_rec_reset_nth_bit(lock, donator_heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-01-23 10:02:02 +00:00
|
|
|
if (UNIV_UNLIKELY(type_mode & LOCK_WAIT)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_reset_lock_and_trx_wait(lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Note that we FIRST reset the bit, and then set the lock:
|
|
|
|
the function works also if donator == receiver */
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock_rec_add_to_queue(type_mode, receiver, receiver_heap_no,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock->index, lock->trx);
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_next(donator_heap_no, lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
ut_ad(lock_rec_get_first(donator, donator_heap_no) == NULL);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when we have reorganized a page. NOTE: we copy
|
|
|
|
also the locks set on the infimum of the page; the infimum may carry
|
|
|
|
locks if an update of a record is occurring on the page, and its locks
|
|
|
|
were temporarily stored on the infimum. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_move_reorganize_page(
|
|
|
|
/*======================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block, /* in: old index page, now
|
|
|
|
reorganized */
|
|
|
|
const buf_block_t* oblock) /* in: copy of the old, not
|
|
|
|
reorganized page */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
UT_LIST_BASE_NODE_T(lock_t) old_locks;
|
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint comp;
|
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first_on_page(block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock == NULL) {
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
heap = mem_heap_create(256);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Copy first all the locks on the page to heap and reset the
|
|
|
|
bitmaps in the original locks; chain the copies of the locks
|
|
|
|
using the trx_locks field in them. */
|
|
|
|
|
|
|
|
UT_LIST_INIT(old_locks);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-01-22 14:44:34 +00:00
|
|
|
do {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Make a copy of the lock */
|
2007-01-22 14:44:34 +00:00
|
|
|
lock_t* old_lock = lock_rec_copy(lock, heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
UT_LIST_ADD_LAST(trx_locks, old_locks, old_lock);
|
|
|
|
|
|
|
|
/* Reset bitmap of lock */
|
|
|
|
lock_rec_bitmap_reset(lock);
|
|
|
|
|
|
|
|
if (lock_get_wait(lock)) {
|
|
|
|
lock_reset_lock_and_trx_wait(lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock = lock_rec_get_next_on_page(lock);
|
2007-01-22 14:44:34 +00:00
|
|
|
} while (lock != NULL);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
comp = page_is_comp(block->frame);
|
|
|
|
ut_ad(comp == page_is_comp(oblock->frame));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-01-22 14:44:34 +00:00
|
|
|
for (lock = UT_LIST_GET_FIRST(old_locks); lock;
|
|
|
|
lock = UT_LIST_GET_NEXT(trx_locks, lock)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* NOTE: we copy also the locks set on the infimum and
|
|
|
|
supremum of the page; the infimum may carry locks if an
|
|
|
|
update of a record is occurring on the page, and its locks
|
|
|
|
were temporarily stored on the infimum */
|
2007-01-22 14:44:34 +00:00
|
|
|
page_cur_t cur1;
|
|
|
|
page_cur_t cur2;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
branches/zip: Remove const warnings reported by GCC 4.2.1.
page_cur_set_before_first(), page_cur_set_after_last(),
page_cur_position(): Add const qualifiers to buf_block_t and rec.
A better solution would be to define a const_page_cur_t and a
set of accessors, but it would lead to severe code duplication.
page_rec_get_n_recs_before(): Add const qualifiers.
page_dir_get_nth_slot(): Define as a const-preserving macro.
page_dir_slot_get_rec(), page_dir_slot_get_n_owned(),
page_dir_find_owner_slot(), page_check_dir(): Add const qualifiers.
page_rec_get_next_low(): Add const qualifiers.
page_rec_get_next_const(), page_rec_get_prev_const(): New functions,
based on the const-less page_rec_get_next() and page_rec_get_prev().
page_cur_get_page(), page_cur_get_block(), page_cur_get_page_zip(),
page_cur_get_rec(): Define as const-preserving macros.
page_cur_try_search_shortcut(), page_cur_search_with_match():
Add const qualifiers.
buf_page_get_mutex(): Add a const qualifier to buf_page_t*.
rec_get_next_ptr_const(): Const variant of rec_get_next_ptr().
2007-10-18 07:12:05 +00:00
|
|
|
page_cur_set_before_first(block, &cur1);
|
|
|
|
page_cur_set_before_first(oblock, &cur2);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Set locks according to old locks */
|
|
|
|
for (;;) {
|
2007-01-22 14:44:34 +00:00
|
|
|
ulint old_heap_no;
|
|
|
|
ulint new_heap_no;
|
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
ut_ad(comp || !memcmp(page_cur_get_rec(&cur1),
|
|
|
|
page_cur_get_rec(&cur2),
|
2006-09-19 10:14:07 +00:00
|
|
|
rec_get_data_size_old(
|
|
|
|
page_cur_get_rec(
|
|
|
|
&cur2))));
|
2005-10-27 11:48:10 +00:00
|
|
|
if (UNIV_LIKELY(comp)) {
|
2006-09-19 10:14:07 +00:00
|
|
|
old_heap_no = rec_get_heap_no_new(
|
|
|
|
page_cur_get_rec(&cur2));
|
|
|
|
new_heap_no = rec_get_heap_no_new(
|
|
|
|
page_cur_get_rec(&cur1));
|
2005-10-27 11:48:10 +00:00
|
|
|
} else {
|
2006-09-19 10:14:07 +00:00
|
|
|
old_heap_no = rec_get_heap_no_old(
|
|
|
|
page_cur_get_rec(&cur2));
|
|
|
|
new_heap_no = rec_get_heap_no_old(
|
|
|
|
page_cur_get_rec(&cur1));
|
2005-10-27 11:48:10 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock_rec_get_nth_bit(lock, old_heap_no)) {
|
|
|
|
|
2007-01-22 14:44:34 +00:00
|
|
|
/* Clear the bit in old_lock. */
|
|
|
|
ut_d(lock_rec_reset_nth_bit(lock,
|
|
|
|
old_heap_no));
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* NOTE that the old lock bitmap could be too
|
|
|
|
small for the new heap number! */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_add_to_queue(lock->type_mode, block,
|
2006-08-29 09:30:31 +00:00
|
|
|
new_heap_no,
|
|
|
|
lock->index, lock->trx);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
/* if (new_heap_no == PAGE_HEAP_NO_SUPREMUM
|
2006-08-29 09:30:31 +00:00
|
|
|
&& lock_get_wait(lock)) {
|
|
|
|
fprintf(stderr,
|
2005-10-27 07:29:40 +00:00
|
|
|
"---\n--\n!!!Lock reorg: supr type %lu\n",
|
2006-08-29 09:30:31 +00:00
|
|
|
lock->type_mode);
|
2005-10-27 07:29:40 +00:00
|
|
|
} */
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (UNIV_UNLIKELY
|
|
|
|
(new_heap_no == PAGE_HEAP_NO_SUPREMUM)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-01-22 14:44:34 +00:00
|
|
|
ut_ad(old_heap_no == PAGE_HEAP_NO_SUPREMUM);
|
2005-10-27 07:29:40 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
page_cur_move_to_next(&cur1);
|
|
|
|
page_cur_move_to_next(&cur2);
|
2007-01-22 15:46:27 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-01-22 14:44:34 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
2007-01-22 15:46:27 +00:00
|
|
|
{
|
|
|
|
ulint i = lock_rec_find_set_bit(lock);
|
|
|
|
|
|
|
|
/* Check that all locks were moved. */
|
|
|
|
if (UNIV_UNLIKELY(i != ULINT_UNDEFINED)) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"lock_move_reorganize_page():"
|
|
|
|
" %lu not moved in %p\n",
|
|
|
|
(ulong) i, (void*) lock);
|
|
|
|
ut_error;
|
2007-01-22 14:44:34 +00:00
|
|
|
}
|
|
|
|
}
|
2007-01-22 15:46:27 +00:00
|
|
|
#endif /* UNIV_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
mem_heap_free(heap);
|
|
|
|
|
2007-01-22 10:24:21 +00:00
|
|
|
#ifdef UNIV_DEBUG_LOCK_VALIDATE
|
2007-01-22 08:48:00 +00:00
|
|
|
ut_ad(lock_rec_validate_page(buf_block_get_space(block),
|
|
|
|
buf_block_get_page_no(block)));
|
2007-01-22 10:24:21 +00:00
|
|
|
#endif
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Moves the explicit locks on user records to another page if a record
|
|
|
|
list end is moved to another page. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_move_rec_list_end(
|
|
|
|
/*===================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* new_block, /* in: index page to move to */
|
|
|
|
const buf_block_t* block, /* in: index page */
|
|
|
|
const rec_t* rec) /* in: record on page: this
|
|
|
|
is the first record moved */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2006-10-24 06:45:52 +00:00
|
|
|
const ulint comp = page_rec_is_comp(rec);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
/* Note: when we move locks from record to record, waiting locks
|
|
|
|
and possible granted gap type locks behind them are enqueued in
|
|
|
|
the original order, because new elements are inserted to a hash
|
|
|
|
table to the end of the hash chain, and lock_rec_add_to_queue
|
|
|
|
does not reuse locks if there are waiters in the queue. */
|
|
|
|
|
2007-01-23 14:10:48 +00:00
|
|
|
for (lock = lock_rec_get_first_on_page(block); lock;
|
|
|
|
lock = lock_rec_get_next_on_page(lock)) {
|
2007-01-23 10:02:02 +00:00
|
|
|
page_cur_t cur1;
|
|
|
|
page_cur_t cur2;
|
|
|
|
const ulint type_mode = lock->type_mode;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
branches/zip: Remove const warnings reported by GCC 4.2.1.
page_cur_set_before_first(), page_cur_set_after_last(),
page_cur_position(): Add const qualifiers to buf_block_t and rec.
A better solution would be to define a const_page_cur_t and a
set of accessors, but it would lead to severe code duplication.
page_rec_get_n_recs_before(): Add const qualifiers.
page_dir_get_nth_slot(): Define as a const-preserving macro.
page_dir_slot_get_rec(), page_dir_slot_get_n_owned(),
page_dir_find_owner_slot(), page_check_dir(): Add const qualifiers.
page_rec_get_next_low(): Add const qualifiers.
page_rec_get_next_const(), page_rec_get_prev_const(): New functions,
based on the const-less page_rec_get_next() and page_rec_get_prev().
page_cur_get_page(), page_cur_get_block(), page_cur_get_page_zip(),
page_cur_get_rec(): Define as const-preserving macros.
page_cur_try_search_shortcut(), page_cur_search_with_match():
Add const qualifiers.
buf_page_get_mutex(): Add a const qualifier to buf_page_t*.
rec_get_next_ptr_const(): Const variant of rec_get_next_ptr().
2007-10-18 07:12:05 +00:00
|
|
|
page_cur_position(rec, block, &cur1);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (page_cur_is_before_first(&cur1)) {
|
|
|
|
page_cur_move_to_next(&cur1);
|
|
|
|
}
|
|
|
|
|
branches/zip: Remove const warnings reported by GCC 4.2.1.
page_cur_set_before_first(), page_cur_set_after_last(),
page_cur_position(): Add const qualifiers to buf_block_t and rec.
A better solution would be to define a const_page_cur_t and a
set of accessors, but it would lead to severe code duplication.
page_rec_get_n_recs_before(): Add const qualifiers.
page_dir_get_nth_slot(): Define as a const-preserving macro.
page_dir_slot_get_rec(), page_dir_slot_get_n_owned(),
page_dir_find_owner_slot(), page_check_dir(): Add const qualifiers.
page_rec_get_next_low(): Add const qualifiers.
page_rec_get_next_const(), page_rec_get_prev_const(): New functions,
based on the const-less page_rec_get_next() and page_rec_get_prev().
page_cur_get_page(), page_cur_get_block(), page_cur_get_page_zip(),
page_cur_get_rec(): Define as const-preserving macros.
page_cur_try_search_shortcut(), page_cur_search_with_match():
Add const qualifiers.
buf_page_get_mutex(): Add a const qualifier to buf_page_t*.
rec_get_next_ptr_const(): Const variant of rec_get_next_ptr().
2007-10-18 07:12:05 +00:00
|
|
|
page_cur_set_before_first(new_block, &cur2);
|
2005-10-27 07:29:40 +00:00
|
|
|
page_cur_move_to_next(&cur2);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Copy lock requests on user records to new page and
|
|
|
|
reset the lock bits on the old */
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
while (!page_cur_is_after_last(&cur1)) {
|
2007-01-23 10:02:02 +00:00
|
|
|
ulint heap_no;
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (comp) {
|
2006-09-19 10:14:07 +00:00
|
|
|
heap_no = rec_get_heap_no_new(
|
|
|
|
page_cur_get_rec(&cur1));
|
2005-10-27 11:48:10 +00:00
|
|
|
} else {
|
2006-09-19 10:14:07 +00:00
|
|
|
heap_no = rec_get_heap_no_old(
|
|
|
|
page_cur_get_rec(&cur1));
|
2008-02-15 14:16:27 +00:00
|
|
|
ut_ad(!memcmp(page_cur_get_rec(&cur1),
|
|
|
|
page_cur_get_rec(&cur2),
|
|
|
|
rec_get_data_size_old(
|
|
|
|
page_cur_get_rec(&cur2))));
|
2005-10-27 11:48:10 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock_rec_get_nth_bit(lock, heap_no)) {
|
|
|
|
lock_rec_reset_nth_bit(lock, heap_no);
|
|
|
|
|
2007-01-23 10:02:02 +00:00
|
|
|
if (UNIV_UNLIKELY(type_mode & LOCK_WAIT)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_reset_lock_and_trx_wait(lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (comp) {
|
2006-09-19 10:14:07 +00:00
|
|
|
heap_no = rec_get_heap_no_new(
|
|
|
|
page_cur_get_rec(&cur2));
|
2005-10-27 11:48:10 +00:00
|
|
|
} else {
|
2006-09-19 10:14:07 +00:00
|
|
|
heap_no = rec_get_heap_no_old(
|
|
|
|
page_cur_get_rec(&cur2));
|
2005-10-27 11:48:10 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_add_to_queue(type_mode,
|
2006-10-24 06:45:52 +00:00
|
|
|
new_block, heap_no,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock->index, lock->trx);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
page_cur_move_to_next(&cur1);
|
|
|
|
page_cur_move_to_next(&cur2);
|
|
|
|
}
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
2007-01-22 10:24:21 +00:00
|
|
|
#ifdef UNIV_DEBUG_LOCK_VALIDATE
|
2006-10-24 06:45:52 +00:00
|
|
|
ut_ad(lock_rec_validate_page(buf_block_get_space(block),
|
|
|
|
buf_block_get_page_no(block)));
|
|
|
|
ut_ad(lock_rec_validate_page(buf_block_get_space(new_block),
|
|
|
|
buf_block_get_page_no(new_block)));
|
2007-01-22 10:24:21 +00:00
|
|
|
#endif
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Moves the explicit locks on user records to another page if a record
|
|
|
|
list start is moved to another page. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_move_rec_list_start(
|
|
|
|
/*=====================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* new_block, /* in: index page to move to */
|
|
|
|
const buf_block_t* block, /* in: index page */
|
|
|
|
const rec_t* rec, /* in: record on page:
|
|
|
|
this is the first
|
|
|
|
record NOT copied */
|
|
|
|
const rec_t* old_end) /* in: old
|
|
|
|
previous-to-last
|
|
|
|
record on new_page
|
|
|
|
before the records
|
|
|
|
were copied */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2006-10-24 06:45:52 +00:00
|
|
|
const ulint comp = page_rec_is_comp(rec);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-10-03 12:22:29 +00:00
|
|
|
ut_ad(block->frame == page_align(rec));
|
|
|
|
ut_ad(new_block->frame == page_align(old_end));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
2007-01-23 14:10:48 +00:00
|
|
|
for (lock = lock_rec_get_first_on_page(block); lock;
|
|
|
|
lock = lock_rec_get_next_on_page(lock)) {
|
2007-01-23 10:02:02 +00:00
|
|
|
page_cur_t cur1;
|
|
|
|
page_cur_t cur2;
|
|
|
|
const ulint type_mode = lock->type_mode;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
branches/zip: Remove const warnings reported by GCC 4.2.1.
page_cur_set_before_first(), page_cur_set_after_last(),
page_cur_position(): Add const qualifiers to buf_block_t and rec.
A better solution would be to define a const_page_cur_t and a
set of accessors, but it would lead to severe code duplication.
page_rec_get_n_recs_before(): Add const qualifiers.
page_dir_get_nth_slot(): Define as a const-preserving macro.
page_dir_slot_get_rec(), page_dir_slot_get_n_owned(),
page_dir_find_owner_slot(), page_check_dir(): Add const qualifiers.
page_rec_get_next_low(): Add const qualifiers.
page_rec_get_next_const(), page_rec_get_prev_const(): New functions,
based on the const-less page_rec_get_next() and page_rec_get_prev().
page_cur_get_page(), page_cur_get_block(), page_cur_get_page_zip(),
page_cur_get_rec(): Define as const-preserving macros.
page_cur_try_search_shortcut(), page_cur_search_with_match():
Add const qualifiers.
buf_page_get_mutex(): Add a const qualifier to buf_page_t*.
rec_get_next_ptr_const(): Const variant of rec_get_next_ptr().
2007-10-18 07:12:05 +00:00
|
|
|
page_cur_set_before_first(block, &cur1);
|
2005-10-27 07:29:40 +00:00
|
|
|
page_cur_move_to_next(&cur1);
|
|
|
|
|
branches/zip: Remove const warnings reported by GCC 4.2.1.
page_cur_set_before_first(), page_cur_set_after_last(),
page_cur_position(): Add const qualifiers to buf_block_t and rec.
A better solution would be to define a const_page_cur_t and a
set of accessors, but it would lead to severe code duplication.
page_rec_get_n_recs_before(): Add const qualifiers.
page_dir_get_nth_slot(): Define as a const-preserving macro.
page_dir_slot_get_rec(), page_dir_slot_get_n_owned(),
page_dir_find_owner_slot(), page_check_dir(): Add const qualifiers.
page_rec_get_next_low(): Add const qualifiers.
page_rec_get_next_const(), page_rec_get_prev_const(): New functions,
based on the const-less page_rec_get_next() and page_rec_get_prev().
page_cur_get_page(), page_cur_get_block(), page_cur_get_page_zip(),
page_cur_get_rec(): Define as const-preserving macros.
page_cur_try_search_shortcut(), page_cur_search_with_match():
Add const qualifiers.
buf_page_get_mutex(): Add a const qualifier to buf_page_t*.
rec_get_next_ptr_const(): Const variant of rec_get_next_ptr().
2007-10-18 07:12:05 +00:00
|
|
|
page_cur_position(old_end, new_block, &cur2);
|
2005-10-27 07:29:40 +00:00
|
|
|
page_cur_move_to_next(&cur2);
|
|
|
|
|
|
|
|
/* Copy lock requests on user records to new page and
|
|
|
|
reset the lock bits on the old */
|
|
|
|
|
|
|
|
while (page_cur_get_rec(&cur1) != rec) {
|
2007-01-23 10:02:02 +00:00
|
|
|
ulint heap_no;
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (comp) {
|
2006-09-19 10:14:07 +00:00
|
|
|
heap_no = rec_get_heap_no_new(
|
|
|
|
page_cur_get_rec(&cur1));
|
2005-10-27 11:48:10 +00:00
|
|
|
} else {
|
2006-09-19 10:14:07 +00:00
|
|
|
heap_no = rec_get_heap_no_old(
|
|
|
|
page_cur_get_rec(&cur1));
|
2008-02-15 14:16:27 +00:00
|
|
|
ut_ad(!memcmp(page_cur_get_rec(&cur1),
|
|
|
|
page_cur_get_rec(&cur2),
|
|
|
|
rec_get_data_size_old(
|
|
|
|
page_cur_get_rec(
|
|
|
|
&cur2))));
|
2005-10-27 11:48:10 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock_rec_get_nth_bit(lock, heap_no)) {
|
|
|
|
lock_rec_reset_nth_bit(lock, heap_no);
|
|
|
|
|
2007-01-23 10:02:02 +00:00
|
|
|
if (UNIV_UNLIKELY(type_mode & LOCK_WAIT)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_reset_lock_and_trx_wait(lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (comp) {
|
2006-09-19 10:14:07 +00:00
|
|
|
heap_no = rec_get_heap_no_new(
|
|
|
|
page_cur_get_rec(&cur2));
|
2005-10-27 11:48:10 +00:00
|
|
|
} else {
|
2006-09-19 10:14:07 +00:00
|
|
|
heap_no = rec_get_heap_no_old(
|
|
|
|
page_cur_get_rec(&cur2));
|
2005-10-27 11:48:10 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_add_to_queue(type_mode,
|
2006-10-24 06:45:52 +00:00
|
|
|
new_block, heap_no,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock->index, lock->trx);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
page_cur_move_to_next(&cur1);
|
|
|
|
page_cur_move_to_next(&cur2);
|
|
|
|
}
|
|
|
|
|
2007-01-23 10:02:02 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (page_rec_is_supremum(rec)) {
|
|
|
|
ulint i;
|
|
|
|
|
2007-01-23 14:10:48 +00:00
|
|
|
for (i = PAGE_HEAP_NO_USER_LOW;
|
|
|
|
i < lock_rec_get_n_bits(lock); i++) {
|
2007-01-23 10:02:02 +00:00
|
|
|
if (UNIV_UNLIKELY
|
|
|
|
(lock_rec_get_nth_bit(lock, i))) {
|
|
|
|
|
|
|
|
fprintf(stderr,
|
|
|
|
"lock_move_rec_list_start():"
|
|
|
|
" %lu not moved in %p\n",
|
|
|
|
(ulong) i, (void*) lock);
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_exit_kernel();
|
2007-01-22 08:48:00 +00:00
|
|
|
|
2007-01-22 10:24:21 +00:00
|
|
|
#ifdef UNIV_DEBUG_LOCK_VALIDATE
|
2006-10-24 06:45:52 +00:00
|
|
|
ut_ad(lock_rec_validate_page(buf_block_get_space(block),
|
|
|
|
buf_block_get_page_no(block)));
|
2007-01-22 10:24:21 +00:00
|
|
|
#endif
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when a page is split to the right. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_update_split_right(
|
|
|
|
/*====================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* right_block, /* in: right page */
|
|
|
|
const buf_block_t* left_block) /* in: left page */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no = lock_get_min_heap_no(right_block);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
/* Move the locks on the supremum of the left page to the supremum
|
|
|
|
of the right page */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_move(right_block, left_block,
|
|
|
|
PAGE_HEAP_NO_SUPREMUM, PAGE_HEAP_NO_SUPREMUM);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Inherit the locks to the supremum of left page from the successor
|
|
|
|
of the infimum on right page */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_inherit_to_gap(left_block, right_block,
|
|
|
|
PAGE_HEAP_NO_SUPREMUM, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when a page is merged to the right. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_update_merge_right(
|
|
|
|
/*====================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* right_block, /* in: right page to
|
|
|
|
which merged */
|
|
|
|
const rec_t* orig_succ, /* in: original
|
|
|
|
successor of infimum
|
|
|
|
on the right page
|
|
|
|
before merge */
|
|
|
|
const buf_block_t* left_block) /* in: merged index
|
|
|
|
page which will be
|
|
|
|
discarded */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_mutex_enter_kernel();
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Inherit the locks from the supremum of the left page to the
|
|
|
|
original successor of infimum on the right page, to which the left
|
|
|
|
page was merged */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_inherit_to_gap(right_block, left_block,
|
|
|
|
page_rec_get_heap_no(orig_succ),
|
|
|
|
PAGE_HEAP_NO_SUPREMUM);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Reset the locks on the supremum of the left page, releasing
|
|
|
|
waiting transactions */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_reset_and_release_wait(left_block,
|
|
|
|
PAGE_HEAP_NO_SUPREMUM);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_free_all_from_discard_page(left_block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when the root page is copied to another in
|
|
|
|
btr_root_raise_and_insert. Note that we leave lock structs on the
|
|
|
|
root page, even though they do not make sense on other than leaf
|
|
|
|
pages: the reason is that in a pessimistic update the infimum record
|
|
|
|
of the root page will act as a dummy carrier of the locks of the record
|
|
|
|
to be updated. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_update_root_raise(
|
|
|
|
/*===================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block, /* in: index page to which copied */
|
|
|
|
const buf_block_t* root) /* in: root page */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
/* Move the locks on the supremum of the root to the supremum
|
2006-10-24 06:45:52 +00:00
|
|
|
of block */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_move(block, root,
|
|
|
|
PAGE_HEAP_NO_SUPREMUM, PAGE_HEAP_NO_SUPREMUM);
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when a page is copied to another and the original page
|
|
|
|
is removed from the chain of leaf pages, except if page is the root! */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_update_copy_and_discard(
|
|
|
|
/*=========================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* new_block, /* in: index page to
|
|
|
|
which copied */
|
|
|
|
const buf_block_t* block) /* in: index page;
|
|
|
|
NOT the root! */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
/* Move the locks on the supremum of the old page to the supremum
|
|
|
|
of new_page */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_move(new_block, block,
|
|
|
|
PAGE_HEAP_NO_SUPREMUM, PAGE_HEAP_NO_SUPREMUM);
|
|
|
|
lock_rec_free_all_from_discard_page(block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when a page is split to the left. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_update_split_left(
|
|
|
|
/*===================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* right_block, /* in: right page */
|
|
|
|
const buf_block_t* left_block) /* in: left page */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no = lock_get_min_heap_no(right_block);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_enter_kernel();
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Inherit the locks to the supremum of the left page from the
|
|
|
|
successor of the infimum on the right page */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_inherit_to_gap(left_block, right_block,
|
|
|
|
PAGE_HEAP_NO_SUPREMUM, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when a page is merged to the left. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_update_merge_left(
|
|
|
|
/*===================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* left_block, /* in: left page to
|
|
|
|
which merged */
|
|
|
|
const rec_t* orig_pred, /* in: original predecessor
|
|
|
|
of supremum on the left page
|
|
|
|
before merge */
|
|
|
|
const buf_block_t* right_block) /* in: merged index page
|
|
|
|
which will be discarded */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
const rec_t* left_next_rec;
|
|
|
|
|
2007-10-03 12:22:29 +00:00
|
|
|
ut_ad(left_block->frame == page_align(orig_pred));
|
2006-10-24 06:45:52 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
branches/zip: Remove const warnings reported by GCC 4.2.1.
page_cur_set_before_first(), page_cur_set_after_last(),
page_cur_position(): Add const qualifiers to buf_block_t and rec.
A better solution would be to define a const_page_cur_t and a
set of accessors, but it would lead to severe code duplication.
page_rec_get_n_recs_before(): Add const qualifiers.
page_dir_get_nth_slot(): Define as a const-preserving macro.
page_dir_slot_get_rec(), page_dir_slot_get_n_owned(),
page_dir_find_owner_slot(), page_check_dir(): Add const qualifiers.
page_rec_get_next_low(): Add const qualifiers.
page_rec_get_next_const(), page_rec_get_prev_const(): New functions,
based on the const-less page_rec_get_next() and page_rec_get_prev().
page_cur_get_page(), page_cur_get_block(), page_cur_get_page_zip(),
page_cur_get_rec(): Define as const-preserving macros.
page_cur_try_search_shortcut(), page_cur_search_with_match():
Add const qualifiers.
buf_page_get_mutex(): Add a const qualifier to buf_page_t*.
rec_get_next_ptr_const(): Const variant of rec_get_next_ptr().
2007-10-18 07:12:05 +00:00
|
|
|
left_next_rec = page_rec_get_next_const(orig_pred);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (!page_rec_is_supremum(left_next_rec)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Inherit the locks on the supremum of the left page to the
|
|
|
|
first record which was moved from the right page */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_inherit_to_gap(left_block, left_block,
|
|
|
|
page_rec_get_heap_no(left_next_rec),
|
|
|
|
PAGE_HEAP_NO_SUPREMUM);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Reset the locks on the supremum of the left page,
|
|
|
|
releasing waiting transactions */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_reset_and_release_wait(left_block,
|
|
|
|
PAGE_HEAP_NO_SUPREMUM);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Move the locks from the supremum of right page to the supremum
|
|
|
|
of the left page */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_move(left_block, right_block,
|
|
|
|
PAGE_HEAP_NO_SUPREMUM, PAGE_HEAP_NO_SUPREMUM);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_free_all_from_discard_page(right_block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Resets the original locks on heir and replaces them with gap type locks
|
|
|
|
inherited from rec. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_rec_reset_and_inherit_gap_locks(
|
|
|
|
/*=================================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* heir_block, /* in: block containing the
|
|
|
|
record which inherits */
|
|
|
|
const buf_block_t* block, /* in: block containing the
|
|
|
|
record from which inherited;
|
|
|
|
does NOT reset the locks on
|
|
|
|
this record */
|
|
|
|
ulint heir_heap_no, /* in: heap_no of the
|
|
|
|
inheriting record */
|
|
|
|
ulint heap_no) /* in: heap_no of the
|
|
|
|
donating record */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-02-23 19:25:29 +00:00
|
|
|
mutex_enter(&kernel_mutex);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_reset_and_release_wait(heir_block, heir_heap_no);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_inherit_to_gap(heir_block, block, heir_heap_no, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
mutex_exit(&kernel_mutex);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when a page is discarded. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_update_discard(
|
|
|
|
/*================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* heir_block, /* in: index page
|
|
|
|
which will inherit the locks */
|
|
|
|
ulint heir_heap_no, /* in: heap_no of the record
|
|
|
|
which will inherit the locks */
|
|
|
|
const buf_block_t* block) /* in: index page
|
|
|
|
which will be discarded */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
const page_t* page = block->frame;
|
|
|
|
const rec_t* rec;
|
|
|
|
ulint heap_no;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (!lock_rec_get_first_on_page(block)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* No locks exist on page, nothing to do */
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Inherit all the locks on the page to the record and reset all
|
|
|
|
the locks on the page */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (page_is_comp(page)) {
|
|
|
|
rec = page + PAGE_NEW_INFIMUM;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
do {
|
|
|
|
heap_no = rec_get_heap_no_new(rec);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_inherit_to_gap(heir_block, block,
|
|
|
|
heir_heap_no, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_reset_and_release_wait(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
rec = page + rec_get_next_offs(rec, TRUE);
|
2006-10-24 11:54:01 +00:00
|
|
|
} while (heap_no != PAGE_HEAP_NO_SUPREMUM);
|
2006-10-24 06:45:52 +00:00
|
|
|
} else {
|
|
|
|
rec = page + PAGE_OLD_INFIMUM;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
do {
|
|
|
|
heap_no = rec_get_heap_no_old(rec);
|
|
|
|
|
|
|
|
lock_rec_inherit_to_gap(heir_block, block,
|
|
|
|
heir_heap_no, heap_no);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_reset_and_release_wait(block, heap_no);
|
|
|
|
|
|
|
|
rec = page + rec_get_next_offs(rec, FALSE);
|
2006-10-24 11:54:01 +00:00
|
|
|
} while (heap_no != PAGE_HEAP_NO_SUPREMUM);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_free_all_from_discard_page(block);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when a new user record is inserted. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_update_insert(
|
|
|
|
/*===============*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block, /* in: buffer block containing rec */
|
|
|
|
const rec_t* rec) /* in: the inserted record */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint receiver_heap_no;
|
|
|
|
ulint donator_heap_no;
|
|
|
|
|
2007-10-03 12:22:29 +00:00
|
|
|
ut_ad(block->frame == page_align(rec));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Inherit the gap-locking locks for rec, in gap mode, from the next
|
|
|
|
record */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (page_rec_is_comp(rec)) {
|
|
|
|
receiver_heap_no = rec_get_heap_no_new(rec);
|
|
|
|
donator_heap_no = rec_get_heap_no_new(
|
branches/zip: Remove const warnings reported by GCC 4.2.1.
page_cur_set_before_first(), page_cur_set_after_last(),
page_cur_position(): Add const qualifiers to buf_block_t and rec.
A better solution would be to define a const_page_cur_t and a
set of accessors, but it would lead to severe code duplication.
page_rec_get_n_recs_before(): Add const qualifiers.
page_dir_get_nth_slot(): Define as a const-preserving macro.
page_dir_slot_get_rec(), page_dir_slot_get_n_owned(),
page_dir_find_owner_slot(), page_check_dir(): Add const qualifiers.
page_rec_get_next_low(): Add const qualifiers.
page_rec_get_next_const(), page_rec_get_prev_const(): New functions,
based on the const-less page_rec_get_next() and page_rec_get_prev().
page_cur_get_page(), page_cur_get_block(), page_cur_get_page_zip(),
page_cur_get_rec(): Define as const-preserving macros.
page_cur_try_search_shortcut(), page_cur_search_with_match():
Add const qualifiers.
buf_page_get_mutex(): Add a const qualifier to buf_page_t*.
rec_get_next_ptr_const(): Const variant of rec_get_next_ptr().
2007-10-18 07:12:05 +00:00
|
|
|
page_rec_get_next_low(rec, TRUE));
|
2006-10-24 06:45:52 +00:00
|
|
|
} else {
|
|
|
|
receiver_heap_no = rec_get_heap_no_old(rec);
|
|
|
|
donator_heap_no = rec_get_heap_no_old(
|
branches/zip: Remove const warnings reported by GCC 4.2.1.
page_cur_set_before_first(), page_cur_set_after_last(),
page_cur_position(): Add const qualifiers to buf_block_t and rec.
A better solution would be to define a const_page_cur_t and a
set of accessors, but it would lead to severe code duplication.
page_rec_get_n_recs_before(): Add const qualifiers.
page_dir_get_nth_slot(): Define as a const-preserving macro.
page_dir_slot_get_rec(), page_dir_slot_get_n_owned(),
page_dir_find_owner_slot(), page_check_dir(): Add const qualifiers.
page_rec_get_next_low(): Add const qualifiers.
page_rec_get_next_const(), page_rec_get_prev_const(): New functions,
based on the const-less page_rec_get_next() and page_rec_get_prev().
page_cur_get_page(), page_cur_get_block(), page_cur_get_page_zip(),
page_cur_get_rec(): Define as const-preserving macros.
page_cur_try_search_shortcut(), page_cur_search_with_match():
Add const qualifiers.
buf_page_get_mutex(): Add a const qualifier to buf_page_t*.
rec_get_next_ptr_const(): Const variant of rec_get_next_ptr().
2007-10-18 07:12:05 +00:00
|
|
|
page_rec_get_next_low(rec, FALSE));
|
2006-10-24 06:45:52 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
lock_rec_inherit_to_gap_if_gap_lock(block,
|
|
|
|
receiver_heap_no, donator_heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Updates the lock table when a record is removed. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_update_delete(
|
|
|
|
/*===============*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block, /* in: buffer block containing rec */
|
|
|
|
const rec_t* rec) /* in: the record to be removed */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
const page_t* page = block->frame;
|
|
|
|
ulint heap_no;
|
|
|
|
ulint next_heap_no;
|
|
|
|
|
2008-02-18 09:53:08 +00:00
|
|
|
ut_ad(page == page_align(rec));
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (page_is_comp(page)) {
|
|
|
|
heap_no = rec_get_heap_no_new(rec);
|
|
|
|
next_heap_no = rec_get_heap_no_new(page
|
|
|
|
+ rec_get_next_offs(rec,
|
|
|
|
TRUE));
|
|
|
|
} else {
|
|
|
|
heap_no = rec_get_heap_no_old(rec);
|
|
|
|
next_heap_no = rec_get_heap_no_old(page
|
|
|
|
+ rec_get_next_offs(rec,
|
|
|
|
FALSE));
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
/* Let the next record inherit the locks from rec, in gap mode */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_inherit_to_gap(block, block, next_heap_no, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Reset the lock bits on rec and release waiting transactions */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_reset_and_release_wait(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*************************************************************************
|
|
|
|
Stores on the page infimum record the explicit locks of another record.
|
|
|
|
This function is used to store the lock state of a record when it is
|
|
|
|
updated and the size of the record changes in the update. The record
|
|
|
|
is moved in such an update, perhaps to another page. The infimum record
|
|
|
|
acts as a dummy carrier record, taking care of lock releases while the
|
|
|
|
actual record is being moved. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_rec_store_on_page_infimum(
|
|
|
|
/*===========================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block, /* in: buffer block containing rec */
|
|
|
|
const rec_t* rec) /* in: record whose lock state
|
|
|
|
is stored on the infimum
|
|
|
|
record of the same page; lock
|
|
|
|
bits are reset on the
|
|
|
|
record */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no = page_rec_get_heap_no(rec);
|
|
|
|
|
2007-10-03 12:22:29 +00:00
|
|
|
ut_ad(block->frame == page_align(rec));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_move(block, block, PAGE_HEAP_NO_INFIMUM, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
lock_mutex_exit_kernel();
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Restores the state of explicit lock requests on a single record, where the
|
|
|
|
state was stored on the infimum of the page. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_rec_restore_from_page_infimum(
|
|
|
|
/*===============================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block, /* in: buffer block containing rec */
|
|
|
|
const rec_t* rec, /* in: record whose lock state
|
2008-02-18 15:45:17 +00:00
|
|
|
is restored */
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* donator)/* in: page (rec is not
|
|
|
|
necessarily on this page)
|
|
|
|
whose infimum stored the lock
|
|
|
|
state; lock bits are reset on
|
|
|
|
the infimum */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no = page_rec_get_heap_no(rec);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_move(block, donator, heap_no, PAGE_HEAP_NO_INFIMUM);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*=========== DEADLOCK CHECKING ======================================*/
|
|
|
|
|
|
|
|
/************************************************************************
|
|
|
|
Checks if a lock request results in a deadlock. */
|
|
|
|
static
|
|
|
|
ibool
|
|
|
|
lock_deadlock_occurs(
|
|
|
|
/*=================*/
|
|
|
|
/* out: TRUE if a deadlock was detected and we
|
|
|
|
chose trx as a victim; FALSE if no deadlock, or
|
|
|
|
there was a deadlock, but we chose other
|
|
|
|
transaction(s) as victim(s) */
|
|
|
|
lock_t* lock, /* in: lock the transaction is requesting */
|
|
|
|
trx_t* trx) /* in: transaction */
|
|
|
|
{
|
|
|
|
dict_table_t* table;
|
|
|
|
dict_index_t* index;
|
|
|
|
trx_t* mark_trx;
|
|
|
|
ulint ret;
|
|
|
|
ulint cost = 0;
|
|
|
|
|
2007-05-29 08:48:16 +00:00
|
|
|
ut_ad(trx);
|
|
|
|
ut_ad(lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
retry:
|
|
|
|
/* We check that adding this trx to the waits-for graph
|
|
|
|
does not produce a cycle. First mark all active transactions
|
|
|
|
with 0: */
|
|
|
|
|
|
|
|
mark_trx = UT_LIST_GET_FIRST(trx_sys->trx_list);
|
|
|
|
|
|
|
|
while (mark_trx) {
|
|
|
|
mark_trx->deadlock_mark = 0;
|
|
|
|
mark_trx = UT_LIST_GET_NEXT(trx_list, mark_trx);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = lock_deadlock_recursive(trx, trx, lock, &cost, 0);
|
|
|
|
|
|
|
|
if (ret == LOCK_VICTIM_IS_OTHER) {
|
|
|
|
/* We chose some other trx as a victim: retry if there still
|
|
|
|
is a deadlock */
|
|
|
|
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
if (UNIV_UNLIKELY(ret == LOCK_VICTIM_IS_START)) {
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock) & LOCK_TABLE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
table = lock->un_member.tab_lock.table;
|
|
|
|
index = NULL;
|
|
|
|
} else {
|
|
|
|
index = lock->index;
|
|
|
|
table = index->table;
|
|
|
|
}
|
|
|
|
|
|
|
|
lock_deadlock_found = TRUE;
|
|
|
|
|
|
|
|
fputs("*** WE ROLL BACK TRANSACTION (2)\n",
|
2006-08-29 09:30:31 +00:00
|
|
|
lock_latest_err_file);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************************************
|
|
|
|
Looks recursively for a deadlock. */
|
|
|
|
static
|
|
|
|
ulint
|
|
|
|
lock_deadlock_recursive(
|
|
|
|
/*====================*/
|
|
|
|
/* out: 0 if no deadlock found,
|
|
|
|
LOCK_VICTIM_IS_START if there was a deadlock
|
|
|
|
and we chose 'start' as the victim,
|
|
|
|
LOCK_VICTIM_IS_OTHER if a deadlock
|
|
|
|
was found and we chose some other trx as a
|
|
|
|
victim: we must do the search again in this
|
|
|
|
last case because there may be another
|
|
|
|
deadlock! */
|
|
|
|
trx_t* start, /* in: recursion starting point */
|
|
|
|
trx_t* trx, /* in: a transaction waiting for a lock */
|
|
|
|
lock_t* wait_lock, /* in: the lock trx is waiting to be granted */
|
|
|
|
ulint* cost, /* in/out: number of calculation steps thus
|
|
|
|
far: if this exceeds LOCK_MAX_N_STEPS_...
|
|
|
|
we return LOCK_VICTIM_IS_START */
|
2006-02-23 19:25:29 +00:00
|
|
|
ulint depth) /* in: recursion depth: if this exceeds
|
2005-10-27 07:29:40 +00:00
|
|
|
LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK, we
|
|
|
|
return LOCK_VICTIM_IS_START */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
ulint bit_no = ULINT_UNDEFINED;
|
|
|
|
trx_t* lock_trx;
|
|
|
|
ulint ret;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-05-29 08:48:16 +00:00
|
|
|
ut_a(trx);
|
|
|
|
ut_a(start);
|
|
|
|
ut_a(wait_lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (trx->deadlock_mark == 1) {
|
|
|
|
/* We have already exhaustively searched the subtree starting
|
|
|
|
from this trx */
|
|
|
|
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
*cost = *cost + 1;
|
|
|
|
|
|
|
|
lock = wait_lock;
|
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(wait_lock) == LOCK_REC) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
bit_no = lock_rec_find_set_bit(wait_lock);
|
|
|
|
|
|
|
|
ut_a(bit_no != ULINT_UNDEFINED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look at the locks ahead of wait_lock in the lock queue */
|
|
|
|
|
|
|
|
for (;;) {
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock) & LOCK_TABLE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
lock = UT_LIST_GET_PREV(un_member.tab_lock.locks,
|
|
|
|
lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_a(bit_no != ULINT_UNDEFINED);
|
|
|
|
|
2007-08-01 07:49:43 +00:00
|
|
|
lock = (lock_t*) lock_rec_get_prev(lock, bit_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (lock == NULL) {
|
|
|
|
/* We can mark this subtree as searched */
|
|
|
|
trx->deadlock_mark = 1;
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock_has_to_wait(wait_lock, lock)) {
|
|
|
|
|
2007-04-02 05:39:41 +00:00
|
|
|
ibool too_far
|
|
|
|
= depth > LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK
|
|
|
|
|| *cost > LOCK_MAX_N_STEPS_IN_DEADLOCK_CHECK;
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_trx = lock->trx;
|
|
|
|
|
2007-04-02 05:39:41 +00:00
|
|
|
if (lock_trx == start || too_far) {
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* We came back to the recursion starting
|
2007-04-02 05:39:41 +00:00
|
|
|
point: a deadlock detected; or we have
|
|
|
|
searched the waits-for graph too long */
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
FILE* ef = lock_latest_err_file;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
rewind(ef);
|
|
|
|
ut_print_timestamp(ef);
|
|
|
|
|
|
|
|
fputs("\n*** (1) TRANSACTION:\n", ef);
|
|
|
|
|
|
|
|
trx_print(ef, wait_lock->trx, 3000);
|
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
fputs("*** (1) WAITING FOR THIS LOCK"
|
|
|
|
" TO BE GRANTED:\n", ef);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(wait_lock) == LOCK_REC) {
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_print(ef, wait_lock);
|
|
|
|
} else {
|
|
|
|
lock_table_print(ef, wait_lock);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
fputs("*** (2) TRANSACTION:\n", ef);
|
|
|
|
|
|
|
|
trx_print(ef, lock->trx, 3000);
|
|
|
|
|
|
|
|
fputs("*** (2) HOLDS THE LOCK(S):\n", ef);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock) == LOCK_REC) {
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_print(ef, lock);
|
|
|
|
} else {
|
|
|
|
lock_table_print(ef, lock);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
fputs("*** (2) WAITING FOR THIS LOCK"
|
|
|
|
" TO BE GRANTED:\n", ef);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(start->wait_lock)
|
2006-08-29 09:30:31 +00:00
|
|
|
== LOCK_REC) {
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_print(ef, start->wait_lock);
|
|
|
|
} else {
|
|
|
|
lock_table_print(ef, start->wait_lock);
|
|
|
|
}
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (lock_print_waits) {
|
2007-04-02 05:39:41 +00:00
|
|
|
fputs("Deadlock detected"
|
|
|
|
" or too long search\n",
|
|
|
|
stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
2007-04-02 05:39:41 +00:00
|
|
|
if (too_far) {
|
|
|
|
|
|
|
|
fputs("TOO DEEP OR LONG SEARCH"
|
|
|
|
" IN THE LOCK TABLE"
|
|
|
|
" WAITS-FOR GRAPH\n", ef);
|
|
|
|
|
|
|
|
return(LOCK_VICTIM_IS_START);
|
|
|
|
}
|
|
|
|
|
2007-05-29 08:48:16 +00:00
|
|
|
if (trx_weight_cmp(wait_lock->trx,
|
|
|
|
start) >= 0) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Our recursion starting point
|
|
|
|
transaction is 'smaller', let us
|
|
|
|
choose 'start' as the victim and roll
|
|
|
|
back it */
|
|
|
|
|
|
|
|
return(LOCK_VICTIM_IS_START);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_deadlock_found = TRUE;
|
|
|
|
|
|
|
|
/* Let us choose the transaction of wait_lock
|
|
|
|
as a victim to try to avoid deadlocking our
|
|
|
|
recursion starting point transaction */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
fputs("*** WE ROLL BACK TRANSACTION (1)\n",
|
2006-08-29 09:30:31 +00:00
|
|
|
ef);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
wait_lock->trx->was_chosen_as_deadlock_victim
|
2006-08-29 09:30:31 +00:00
|
|
|
= TRUE;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_cancel_waiting_and_release(wait_lock);
|
|
|
|
|
|
|
|
/* Since trx and wait_lock are no longer
|
|
|
|
in the waits-for graph, we can return FALSE;
|
|
|
|
note that our selective algorithm can choose
|
|
|
|
several transactions as victims, but still
|
|
|
|
we may end up rolling back also the recursion
|
|
|
|
starting point transaction! */
|
|
|
|
|
|
|
|
return(LOCK_VICTIM_IS_OTHER);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (lock_trx->que_state == TRX_QUE_LOCK_WAIT) {
|
|
|
|
|
|
|
|
/* Another trx ahead has requested lock in an
|
|
|
|
incompatible mode, and is itself waiting for
|
|
|
|
a lock */
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
ret = lock_deadlock_recursive(
|
|
|
|
start, lock_trx,
|
|
|
|
lock_trx->wait_lock, cost, depth + 1);
|
2005-10-27 07:29:40 +00:00
|
|
|
if (ret != 0) {
|
|
|
|
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}/* end of the 'for (;;)'-loop */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*========================= TABLE LOCKS ==============================*/
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Creates a table lock object and adds it as the last in the lock queue
|
|
|
|
of the table. Does NOT check for deadlocks or lock compatibility. */
|
|
|
|
UNIV_INLINE
|
|
|
|
lock_t*
|
|
|
|
lock_table_create(
|
|
|
|
/*==============*/
|
2005-11-29 12:30:46 +00:00
|
|
|
/* out, own: new lock object */
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_table_t* table, /* in: database table in dictionary cache */
|
|
|
|
ulint type_mode,/* in: lock mode possibly ORed with
|
|
|
|
LOCK_WAIT */
|
|
|
|
trx_t* trx) /* in: trx */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(table && trx);
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2007-08-30 09:21:25 +00:00
|
|
|
if ((type_mode & LOCK_MODE_MASK) == LOCK_AUTO_INC) {
|
|
|
|
++table->n_waiting_or_granted_auto_inc_locks;
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
/* For AUTOINC locking we reuse the lock instance only if
|
|
|
|
there is no wait involved else we allocate the waiting lock
|
|
|
|
from the transaction lock heap. */
|
2005-10-27 07:29:40 +00:00
|
|
|
if (type_mode == LOCK_AUTO_INC) {
|
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
lock = table->autoinc_lock;
|
|
|
|
|
|
|
|
table->autoinc_trx = trx;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
ib_vector_push(trx->autoinc_locks, lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
|
|
|
lock = mem_heap_alloc(trx->lock_heap, sizeof(lock_t));
|
|
|
|
}
|
|
|
|
|
|
|
|
UT_LIST_ADD_LAST(trx_locks, trx->trx_locks, lock);
|
|
|
|
|
|
|
|
lock->type_mode = type_mode | LOCK_TABLE;
|
|
|
|
lock->trx = trx;
|
|
|
|
|
|
|
|
lock->un_member.tab_lock.table = table;
|
|
|
|
|
|
|
|
UT_LIST_ADD_LAST(un_member.tab_lock.locks, table->locks, lock);
|
|
|
|
|
2007-01-23 10:02:02 +00:00
|
|
|
if (UNIV_UNLIKELY(type_mode & LOCK_WAIT)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_set_lock_and_trx_wait(lock, trx);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Removes a table lock request from the queue and the trx list of locks;
|
|
|
|
this is a low-level function which does NOT check if waiting requests
|
|
|
|
can now be granted. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
lock_table_remove_low(
|
|
|
|
/*==================*/
|
|
|
|
lock_t* lock) /* in: table lock */
|
|
|
|
{
|
|
|
|
trx_t* trx;
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
dict_table_t* table;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
trx = lock->trx;
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
table = lock->un_member.tab_lock.table;
|
|
|
|
|
|
|
|
/* Remove the table from the transaction's AUTOINC vector, if
|
|
|
|
the lock that is being release is an AUTOINC lock. */
|
|
|
|
if (lock_get_mode(lock) == LOCK_AUTO_INC) {
|
|
|
|
|
|
|
|
/* The table's AUTOINC lock can get transferred to
|
|
|
|
another transaction before we get here. */
|
|
|
|
if (table->autoinc_trx == trx) {
|
|
|
|
table->autoinc_trx = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The locks must be freed in the reverse order from
|
|
|
|
the one in which they were acquired. This is to avoid
|
|
|
|
traversing the AUTOINC lock vector unnecessarily.
|
|
|
|
|
|
|
|
We only store locks that were granted in the
|
|
|
|
trx->autoinc_locks vector (see lock_table_create()
|
|
|
|
and lock_grant()). Therefore it can be empty and we
|
|
|
|
need to check for that. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
if (!ib_vector_is_empty(trx->autoinc_locks)) {
|
|
|
|
lock_t* autoinc_lock;
|
|
|
|
|
|
|
|
autoinc_lock = ib_vector_pop(trx->autoinc_locks);
|
|
|
|
ut_a(autoinc_lock == lock);
|
|
|
|
}
|
2007-08-30 09:21:25 +00:00
|
|
|
|
|
|
|
ut_a(table->n_waiting_or_granted_auto_inc_locks > 0);
|
|
|
|
--table->n_waiting_or_granted_auto_inc_locks;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
UT_LIST_REMOVE(trx_locks, trx->trx_locks, lock);
|
|
|
|
UT_LIST_REMOVE(un_member.tab_lock.locks, table->locks, lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Enqueues a waiting request for a table lock which cannot be granted
|
|
|
|
immediately. Checks for deadlocks. */
|
|
|
|
static
|
|
|
|
ulint
|
|
|
|
lock_table_enqueue_waiting(
|
|
|
|
/*=======================*/
|
|
|
|
/* out: DB_LOCK_WAIT, DB_DEADLOCK, or
|
|
|
|
DB_QUE_THR_SUSPENDED, or DB_SUCCESS;
|
|
|
|
DB_SUCCESS means that there was a deadlock,
|
|
|
|
but another transaction was chosen as a
|
|
|
|
victim, and we got the lock immediately:
|
|
|
|
no need to wait then */
|
|
|
|
ulint mode, /* in: lock mode this transaction is
|
|
|
|
requesting */
|
|
|
|
dict_table_t* table, /* in: table */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
trx_t* trx;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Test if there already is some other reason to suspend thread:
|
|
|
|
we do not enqueue a lock request if the query thread should be
|
|
|
|
stopped anyway */
|
|
|
|
|
|
|
|
if (que_thr_stop(thr)) {
|
|
|
|
ut_error;
|
|
|
|
|
|
|
|
return(DB_QUE_THR_SUSPENDED);
|
|
|
|
}
|
|
|
|
|
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
|
2007-10-19 10:52:25 +00:00
|
|
|
switch (trx_get_dict_operation(trx)) {
|
|
|
|
case TRX_DICT_OP_NONE:
|
|
|
|
break;
|
|
|
|
case TRX_DICT_OP_TABLE:
|
|
|
|
case TRX_DICT_OP_INDEX:
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_print_timestamp(stderr);
|
2006-08-29 09:30:31 +00:00
|
|
|
fputs(" InnoDB: Error: a table lock wait happens"
|
|
|
|
" in a dictionary operation!\n"
|
|
|
|
"InnoDB: Table name ", stderr);
|
2006-06-13 20:23:26 +00:00
|
|
|
ut_print_name(stderr, trx, TRUE, table->name);
|
2005-10-27 07:29:40 +00:00
|
|
|
fputs(".\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Submit a detailed bug report"
|
|
|
|
" to http://bugs.mysql.com\n",
|
|
|
|
stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Enqueue the lock request that will wait to be granted */
|
|
|
|
|
|
|
|
lock = lock_table_create(table, mode | LOCK_WAIT, trx);
|
|
|
|
|
|
|
|
/* Check if a deadlock occurs: if yes, remove the lock request and
|
|
|
|
return an error code */
|
|
|
|
|
|
|
|
if (lock_deadlock_occurs(lock, trx)) {
|
|
|
|
|
|
|
|
lock_reset_lock_and_trx_wait(lock);
|
|
|
|
lock_table_remove_low(lock);
|
|
|
|
|
|
|
|
return(DB_DEADLOCK);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (trx->wait_lock == NULL) {
|
|
|
|
/* Deadlock resolution chose another transaction as a victim,
|
|
|
|
and we accidentally got our lock granted! */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
trx->que_state = TRX_QUE_LOCK_WAIT;
|
|
|
|
trx->was_chosen_as_deadlock_victim = FALSE;
|
|
|
|
trx->wait_started = time(NULL);
|
|
|
|
|
|
|
|
ut_a(que_thr_stop(thr));
|
|
|
|
|
|
|
|
return(DB_LOCK_WAIT);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if other transactions have an incompatible mode lock request in
|
|
|
|
the lock queue. */
|
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
lock_table_other_has_incompatible(
|
|
|
|
/*==============================*/
|
|
|
|
trx_t* trx, /* in: transaction, or NULL if all
|
|
|
|
transactions should be included */
|
|
|
|
ulint wait, /* in: LOCK_WAIT if also waiting locks are
|
|
|
|
taken into account, or 0 if not */
|
|
|
|
dict_table_t* table, /* in: table */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode mode) /* in: lock mode */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_LAST(table->locks);
|
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
if ((lock->trx != trx)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& (!lock_mode_compatible(lock_get_mode(lock), mode))
|
|
|
|
&& (wait || !(lock_get_wait(lock)))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
return(TRUE);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_PREV(un_member.tab_lock.locks, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Locks the specified database table in the mode given. If the lock cannot
|
|
|
|
be granted immediately, the query thread is put to wait. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_table(
|
|
|
|
/*=======*/
|
|
|
|
/* out: DB_SUCCESS, DB_LOCK_WAIT,
|
|
|
|
DB_DEADLOCK, or DB_QUE_THR_SUSPENDED */
|
|
|
|
ulint flags, /* in: if BTR_NO_LOCKING_FLAG bit is set,
|
|
|
|
does nothing */
|
|
|
|
dict_table_t* table, /* in: database table in dictionary cache */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode mode, /* in: lock mode */
|
2005-10-27 07:29:40 +00:00
|
|
|
que_thr_t* thr) /* in: query thread */
|
|
|
|
{
|
|
|
|
trx_t* trx;
|
|
|
|
ulint err;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(table && thr);
|
|
|
|
|
|
|
|
if (flags & BTR_NO_LOCKING_FLAG) {
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_a(flags == 0);
|
|
|
|
|
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
/* Look for stronger locks the same trx already has on the table */
|
|
|
|
|
|
|
|
if (lock_table_has(trx, table, mode)) {
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We have to check if the new lock is compatible with any locks
|
|
|
|
other transactions have in the table lock queue. */
|
|
|
|
|
|
|
|
if (lock_table_other_has_incompatible(trx, LOCK_WAIT, table, mode)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Another trx has a request on the table in an incompatible
|
|
|
|
mode: this trx may have to wait */
|
|
|
|
|
|
|
|
err = lock_table_enqueue_waiting(mode | flags, table, thr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
lock_table_create(table, mode | flags, trx);
|
|
|
|
|
|
|
|
ut_a(!flags || mode == LOCK_S || mode == LOCK_X);
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if there are any locks set on the table. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_is_on_table(
|
|
|
|
/*=============*/
|
|
|
|
/* out: TRUE if there are lock(s) */
|
|
|
|
dict_table_t* table) /* in: database table in dictionary cache */
|
|
|
|
{
|
|
|
|
ibool ret;
|
|
|
|
|
|
|
|
ut_ad(table);
|
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
if (UT_LIST_GET_LAST(table->locks)) {
|
|
|
|
ret = TRUE;
|
|
|
|
} else {
|
|
|
|
ret = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if a waiting table lock request still has to wait in a queue. */
|
|
|
|
static
|
|
|
|
ibool
|
|
|
|
lock_table_has_to_wait_in_queue(
|
|
|
|
/*============================*/
|
|
|
|
/* out: TRUE if still has to wait */
|
|
|
|
lock_t* wait_lock) /* in: waiting table lock */
|
|
|
|
{
|
|
|
|
dict_table_t* table;
|
|
|
|
lock_t* lock;
|
|
|
|
|
branches/innodb+: Merge revisions 3931:4006 from branches/zip:
------------------------------------------------------------------------
r3938 | marko | 2009-01-15 10:28:23 +0200 (Thu, 15 Jan 2009) | 3 lines
branches/zip: buf_LRU_invalidate_tablespace(), buf_LRU_free_block():
Add comments and assertions that buf_LRU_block_remove_hashed_page()
will release block_mutex when it returns BUF_BLOCK_ZIP_FREE.
------------------------------------------------------------------------
r3939 | marko | 2009-01-15 10:37:51 +0200 (Thu, 15 Jan 2009) | 7 lines
branches/zip: buf0lru.c: Improve debug assertions.
buf_LRU_block_free_non_file_page(): ut_ad(block) before dereferencing block.
buf_LRU_block_remove_hashed_page(): Forbid buf_pool_mutex_exit() while
calling buf_buddy_free(). Callers of buf_LRU_block_remove_hashed_page()
assume that the buffer pool mutex will not be released and reacquired.
------------------------------------------------------------------------
r3944 | vasil | 2009-01-15 21:15:00 +0200 (Thu, 15 Jan 2009) | 4 lines
branches/zip:
Add ChangeLog entries for the bug fixes in r3911 and r3930.
------------------------------------------------------------------------
r3958 | marko | 2009-01-16 14:53:40 +0200 (Fri, 16 Jan 2009) | 8 lines
branches/zip: Add assertions that the kernel_mutex is being held
while accessing table->locks or un_member.tab_lock.locks.
This is related to Issue #158. According to static analysis,
the added debug assertions should always hold.
lock_table_has_to_wait_in_queue(), lock_queue_iterator_reset(),
lock_queue_iterator_get_prev(), add_trx_relevant_locks_to_cache(),
fetch_data_into_cache(): Add ut_ad(mutex_own(&kernel_mutex)).
------------------------------------------------------------------------
r4006 | marko | 2009-01-20 16:29:22 +0200 (Tue, 20 Jan 2009) | 33 lines
branches/zip: Merge revisions 3930:4005 from branches/5.1:
------------------------------------------------------------------------
r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines
branches/5.1: Merge r4003 from branches/5.0:
rec_set_nth_field(): When the field already is SQL null,
do nothing when it is being changed to SQL null. (Bug #41571)
Normally, MySQL does not pass "do-nothing" updates to the storage engine.
When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT
is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted
without this fix.
rb://81 approved by Heikki Tuuri
------------------------------------------------------------------------
r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines
branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before
accessing table->locks and release kernel_mutex before returning from
the function. This fixes a portential race condition in the
"commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX,
and OPTIMIZE TABLE. (Bug #42152)
rb://80 approved by Heikki Tuuri
------------------------------------------------------------------------
2009-01-20 14:34:02 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2006-02-23 19:25:29 +00:00
|
|
|
ut_ad(lock_get_wait(wait_lock));
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
table = wait_lock->un_member.tab_lock.table;
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_FIRST(table->locks);
|
|
|
|
|
|
|
|
while (lock != wait_lock) {
|
|
|
|
|
|
|
|
if (lock_has_to_wait(wait_lock, lock)) {
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
return(TRUE);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_NEXT(un_member.tab_lock.locks, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
Removes a table lock request, waiting or granted, from the queue and grants
|
|
|
|
locks to other transactions in the queue, if they now are entitled to a
|
|
|
|
lock. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_table_dequeue(
|
|
|
|
/*===============*/
|
|
|
|
lock_t* in_lock)/* in: table lock object; transactions waiting
|
|
|
|
behind will get their lock requests granted, if
|
|
|
|
they are now qualified to it */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_a(lock_get_type_low(in_lock) == LOCK_TABLE);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock = UT_LIST_GET_NEXT(un_member.tab_lock.locks, in_lock);
|
|
|
|
|
|
|
|
lock_table_remove_low(in_lock);
|
|
|
|
|
|
|
|
/* Check if waiting locks in the queue can now be granted: grant
|
|
|
|
locks if there are no conflicting locks ahead. */
|
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
|
|
|
|
if (lock_get_wait(lock)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !lock_table_has_to_wait_in_queue(lock)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Grant the lock */
|
|
|
|
lock_grant(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_NEXT(un_member.tab_lock.locks, lock);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*=========================== LOCK RELEASE ==============================*/
|
|
|
|
|
2006-02-17 14:19:39 +00:00
|
|
|
/*****************************************************************
|
|
|
|
Removes a granted record lock of a transaction from the queue and grants
|
|
|
|
locks to other transactions waiting in the queue if they now are entitled
|
|
|
|
to a lock. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2006-02-17 14:19:39 +00:00
|
|
|
void
|
|
|
|
lock_rec_unlock(
|
|
|
|
/*============*/
|
2006-10-24 06:45:52 +00:00
|
|
|
trx_t* trx, /* in: transaction that has
|
|
|
|
set a record lock */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing rec */
|
|
|
|
const rec_t* rec, /* in: record */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode lock_mode)/* in: LOCK_S or LOCK_X */
|
2006-02-17 14:19:39 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
lock_t* release_lock = NULL;
|
|
|
|
ulint heap_no;
|
|
|
|
|
|
|
|
ut_ad(trx && rec);
|
2007-10-03 12:22:29 +00:00
|
|
|
ut_ad(block->frame == page_align(rec));
|
2006-02-17 14:19:39 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
heap_no = page_rec_get_heap_no(rec);
|
2006-02-17 14:19:39 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
mutex_enter(&kernel_mutex);
|
2006-02-17 14:19:39 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
/* Find the last lock with the same lock_mode and transaction
|
|
|
|
from the record. */
|
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
if (lock->trx == trx && lock_get_mode(lock) == lock_mode) {
|
|
|
|
release_lock = lock;
|
|
|
|
ut_a(!lock_get_wait(lock));
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If a record lock is found, release the record lock */
|
|
|
|
|
|
|
|
if (UNIV_LIKELY(release_lock != NULL)) {
|
|
|
|
lock_rec_reset_nth_bit(release_lock, heap_no);
|
|
|
|
} else {
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
ut_print_timestamp(stderr);
|
|
|
|
fprintf(stderr,
|
2006-08-29 09:30:31 +00:00
|
|
|
" InnoDB: Error: unlock row could not"
|
|
|
|
" find a %lu mode lock on the record\n",
|
|
|
|
(ulong) lock_mode);
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if we can now grant waiting lock requests */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
if (lock_get_wait(lock)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !lock_rec_has_to_wait_in_queue(lock)) {
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
/* Grant the lock */
|
|
|
|
lock_grant(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_exit(&kernel_mutex);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2006-02-17 14:19:39 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*************************************************************************
|
|
|
|
Releases a table lock.
|
|
|
|
Releases possible other transactions waiting for this lock. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_table_unlock(
|
|
|
|
/*==============*/
|
|
|
|
lock_t* lock) /* in: lock */
|
|
|
|
{
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
|
|
|
|
lock_table_dequeue(lock);
|
|
|
|
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Releases transaction locks, and releases possible other transactions waiting
|
|
|
|
because of these locks. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_release_off_kernel(
|
|
|
|
/*====================*/
|
|
|
|
trx_t* trx) /* in: transaction */
|
|
|
|
{
|
|
|
|
dict_table_t* table;
|
|
|
|
ulint count;
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_LAST(trx->trx_locks);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
count = 0;
|
|
|
|
|
|
|
|
while (lock != NULL) {
|
|
|
|
|
|
|
|
count++;
|
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock) == LOCK_REC) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_dequeue_from_page(lock);
|
|
|
|
} else {
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) & LOCK_TABLE);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock_get_mode(lock) != LOCK_IS
|
2007-05-18 11:01:58 +00:00
|
|
|
&& !ut_dulint_is_zero(trx->undo_no)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
/* The trx may have modified the table. We
|
|
|
|
block the use of the MySQL query cache for
|
|
|
|
all currently active transactions. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
table = lock->un_member.tab_lock.table;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
table->query_cache_inv_trx_id
|
|
|
|
= trx_sys->max_trx_id;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lock_table_dequeue(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (count == LOCK_RELEASE_KERNEL_INTERVAL) {
|
|
|
|
/* Release the kernel mutex for a while, so that we
|
|
|
|
do not monopolize it */
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
count = 0;
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock = UT_LIST_GET_LAST(trx->trx_locks);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
ut_a(ib_vector_size(trx->autoinc_locks) == 0);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
mem_heap_empty(trx->lock_heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Cancels a waiting lock request and releases possible other transactions
|
|
|
|
waiting behind it. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_cancel_waiting_and_release(
|
|
|
|
/*============================*/
|
|
|
|
lock_t* lock) /* in: waiting lock request */
|
|
|
|
{
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock) == LOCK_REC) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_dequeue_from_page(lock);
|
|
|
|
} else {
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) & LOCK_TABLE);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
if (lock->trx->autoinc_locks != NULL) {
|
|
|
|
/* Release the transaction's AUTOINC locks/ */
|
|
|
|
lock_release_autoinc_locks(lock->trx);
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_table_dequeue(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reset the wait flag and the back pointer to lock in trx */
|
|
|
|
|
|
|
|
lock_reset_lock_and_trx_wait(lock);
|
|
|
|
|
|
|
|
/* The following function releases the trx from lock wait */
|
|
|
|
|
|
|
|
trx_end_lock_wait(lock->trx);
|
|
|
|
}
|
|
|
|
|
2008-10-11 19:37:21 +00:00
|
|
|
/* True if a lock mode is S or X */
|
|
|
|
#define IS_LOCK_S_OR_X(lock) \
|
|
|
|
(lock_get_mode(lock) == LOCK_S \
|
|
|
|
|| lock_get_mode(lock) == LOCK_X)
|
|
|
|
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*************************************************************************
|
2008-10-11 19:37:21 +00:00
|
|
|
Removes locks of a transaction on a table to be dropped.
|
|
|
|
If remove_also_table_sx_locks is TRUE then table-level S and X locks are
|
|
|
|
also removed in addition to other table-level and record-level locks.
|
|
|
|
No lock, that is going to be removed, is allowed to be a wait lock. */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
void
|
2008-10-11 19:37:21 +00:00
|
|
|
lock_remove_all_on_table_for_trx(
|
|
|
|
/*=============================*/
|
|
|
|
dict_table_t* table, /* in: table to be dropped */
|
|
|
|
trx_t* trx, /* in: a transaction */
|
|
|
|
ibool remove_also_table_sx_locks)/* in: also removes
|
|
|
|
table S and X locks */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
lock_t* prev_lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_LAST(trx->trx_locks);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
while (lock != NULL) {
|
|
|
|
prev_lock = UT_LIST_GET_PREV(trx_locks, lock);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock) == LOCK_REC
|
2006-08-29 09:30:31 +00:00
|
|
|
&& lock->index->table == table) {
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_a(!lock_get_wait(lock));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_discard(lock);
|
2007-09-04 07:54:29 +00:00
|
|
|
} else if (lock_get_type_low(lock) & LOCK_TABLE
|
2008-10-11 19:37:21 +00:00
|
|
|
&& lock->un_member.tab_lock.table == table
|
|
|
|
&& (remove_also_table_sx_locks
|
|
|
|
|| !IS_LOCK_S_OR_X(lock))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_a(!lock_get_wait(lock));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_table_remove_low(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = prev_lock;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
2008-10-11 19:37:21 +00:00
|
|
|
Removes locks on a table to be dropped or truncated.
|
|
|
|
If remove_also_table_sx_locks is TRUE then table-level S and X locks are
|
|
|
|
also removed in addition to other table-level and record-level locks.
|
|
|
|
No lock, that is going to be removed, is allowed to be a wait lock. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
2008-10-11 19:37:21 +00:00
|
|
|
lock_remove_all_on_table(
|
|
|
|
/*=====================*/
|
|
|
|
dict_table_t* table, /* in: table to be dropped
|
|
|
|
or truncated */
|
|
|
|
ibool remove_also_table_sx_locks)/* in: also removes
|
|
|
|
table S and X locks */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
lock_t* lock;
|
2008-10-11 19:37:21 +00:00
|
|
|
lock_t* prev_lock;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_FIRST(table->locks);
|
|
|
|
|
2008-10-11 19:37:21 +00:00
|
|
|
while (lock != NULL) {
|
|
|
|
|
|
|
|
prev_lock = UT_LIST_GET_PREV(un_member.tab_lock.locks,
|
|
|
|
lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2008-10-11 19:37:21 +00:00
|
|
|
/* If we should remove all locks (remove_also_table_sx_locks
|
|
|
|
is TRUE), or if the lock is not table-level S or X lock,
|
|
|
|
then check we are not going to remove a wait lock. */
|
|
|
|
if (remove_also_table_sx_locks
|
|
|
|
|| !(lock_get_type(lock) == LOCK_TABLE
|
|
|
|
&& IS_LOCK_S_OR_X(lock))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2008-10-11 19:37:21 +00:00
|
|
|
ut_a(!lock_get_wait(lock));
|
|
|
|
}
|
|
|
|
|
|
|
|
lock_remove_all_on_table_for_trx(table, lock->trx,
|
|
|
|
remove_also_table_sx_locks);
|
|
|
|
|
|
|
|
if (prev_lock == NULL) {
|
|
|
|
if (lock == UT_LIST_GET_FIRST(table->locks)) {
|
|
|
|
/* lock was not removed, pick its successor */
|
|
|
|
lock = UT_LIST_GET_NEXT(
|
|
|
|
un_member.tab_lock.locks, lock);
|
|
|
|
} else {
|
|
|
|
/* lock was removed, pick the first one */
|
|
|
|
lock = UT_LIST_GET_FIRST(table->locks);
|
|
|
|
}
|
|
|
|
} else if (UT_LIST_GET_NEXT(un_member.tab_lock.locks,
|
|
|
|
prev_lock) != lock) {
|
|
|
|
/* If lock was removed by
|
|
|
|
lock_remove_all_on_table_for_trx() then pick the
|
|
|
|
successor of prev_lock ... */
|
|
|
|
lock = UT_LIST_GET_NEXT(
|
|
|
|
un_member.tab_lock.locks, prev_lock);
|
|
|
|
} else {
|
|
|
|
/* ... otherwise pick the successor of lock. */
|
|
|
|
lock = UT_LIST_GET_NEXT(
|
|
|
|
un_member.tab_lock.locks, lock);
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*===================== VALIDATION AND DEBUGGING ====================*/
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Prints info of a table lock. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_table_print(
|
|
|
|
/*=============*/
|
2007-08-01 07:49:43 +00:00
|
|
|
FILE* file, /* in: file where to print */
|
|
|
|
const lock_t* lock) /* in: table type lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_a(lock_get_type_low(lock) == LOCK_TABLE);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
fputs("TABLE LOCK table ", file);
|
2006-06-13 20:23:26 +00:00
|
|
|
ut_print_name(file, lock->trx, TRUE,
|
2006-08-29 09:30:31 +00:00
|
|
|
lock->un_member.tab_lock.table->name);
|
2007-12-20 14:08:16 +00:00
|
|
|
fprintf(file, " trx id " TRX_ID_FMT,
|
|
|
|
TRX_ID_PREP_PRINTF(lock->trx->id));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock_get_mode(lock) == LOCK_S) {
|
|
|
|
fputs(" lock mode S", file);
|
|
|
|
} else if (lock_get_mode(lock) == LOCK_X) {
|
|
|
|
fputs(" lock mode X", file);
|
|
|
|
} else if (lock_get_mode(lock) == LOCK_IS) {
|
|
|
|
fputs(" lock mode IS", file);
|
|
|
|
} else if (lock_get_mode(lock) == LOCK_IX) {
|
|
|
|
fputs(" lock mode IX", file);
|
|
|
|
} else if (lock_get_mode(lock) == LOCK_AUTO_INC) {
|
|
|
|
fputs(" lock mode AUTO-INC", file);
|
|
|
|
} else {
|
2006-08-29 09:30:31 +00:00
|
|
|
fprintf(file, " unknown lock mode %lu",
|
|
|
|
(ulong) lock_get_mode(lock));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (lock_get_wait(lock)) {
|
|
|
|
fputs(" waiting", file);
|
|
|
|
}
|
|
|
|
|
|
|
|
putc('\n', file);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*************************************************************************
|
|
|
|
Prints info of a record lock. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_rec_print(
|
|
|
|
/*===========*/
|
2007-08-01 07:49:43 +00:00
|
|
|
FILE* file, /* in: file where to print */
|
|
|
|
const lock_t* lock) /* in: record type lock */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2007-10-01 07:32:45 +00:00
|
|
|
const buf_block_t* block;
|
|
|
|
ulint space;
|
|
|
|
ulint page_no;
|
|
|
|
ulint i;
|
|
|
|
mtr_t mtr;
|
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets = offsets_;
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_a(lock_get_type_low(lock) == LOCK_REC);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
space = lock->un_member.rec_lock.space;
|
2006-02-23 19:25:29 +00:00
|
|
|
page_no = lock->un_member.rec_lock.page_no;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
fprintf(file, "RECORD LOCKS space id %lu page no %lu n bits %lu ",
|
2006-02-23 19:25:29 +00:00
|
|
|
(ulong) space, (ulong) page_no,
|
|
|
|
(ulong) lock_rec_get_n_bits(lock));
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_name_print(file, lock->trx, lock->index);
|
2007-12-20 14:08:16 +00:00
|
|
|
fprintf(file, " trx id " TRX_ID_FMT,
|
|
|
|
TRX_ID_PREP_PRINTF(lock->trx->id));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (lock_get_mode(lock) == LOCK_S) {
|
|
|
|
fputs(" lock mode S", file);
|
|
|
|
} else if (lock_get_mode(lock) == LOCK_X) {
|
|
|
|
fputs(" lock_mode X", file);
|
|
|
|
} else {
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock_rec_get_gap(lock)) {
|
|
|
|
fputs(" locks gap before rec", file);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock_rec_get_rec_not_gap(lock)) {
|
|
|
|
fputs(" locks rec but not gap", file);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock_rec_get_insert_intention(lock)) {
|
|
|
|
fputs(" insert intention", file);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock_get_wait(lock)) {
|
|
|
|
fputs(" waiting", file);
|
|
|
|
}
|
|
|
|
|
|
|
|
mtr_start(&mtr);
|
|
|
|
|
|
|
|
putc('\n', file);
|
|
|
|
|
2007-09-27 14:35:18 +00:00
|
|
|
block = buf_page_try_get(space, page_no, &mtr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-01-18 09:59:00 +00:00
|
|
|
if (block) {
|
2007-10-01 07:32:45 +00:00
|
|
|
for (i = 0; i < lock_rec_get_n_bits(lock); i++) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-10-01 07:32:45 +00:00
|
|
|
if (lock_rec_get_nth_bit(lock, i)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-20 12:45:53 +00:00
|
|
|
const rec_t* rec
|
2006-10-12 11:05:22 +00:00
|
|
|
= page_find_rec_with_heap_no(
|
|
|
|
buf_block_get_frame(block), i);
|
2006-09-19 10:14:07 +00:00
|
|
|
offsets = rec_get_offsets(
|
|
|
|
rec, lock->index, offsets,
|
|
|
|
ULINT_UNDEFINED, &heap);
|
2007-10-01 07:32:45 +00:00
|
|
|
|
|
|
|
fprintf(file, "Record lock, heap no %lu ",
|
|
|
|
(ulong) i);
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_print_new(file, rec, offsets);
|
2007-10-01 07:32:45 +00:00
|
|
|
putc('\n', file);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2007-10-01 07:32:45 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < lock_rec_get_n_bits(lock); i++) {
|
|
|
|
fprintf(file, "Record lock, heap no %lu\n", (ulong) i);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
#ifndef UNIV_HOTBACKUP
|
2008-08-09 00:15:46 +00:00
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
/* Print the number of lock structs from lock_print_info_summary() only
|
|
|
|
in non-production builds for performance reasons, see
|
|
|
|
http://bugs.mysql.com/36942 */
|
|
|
|
#define PRINT_NUM_OF_LOCK_STRUCTS
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
#ifdef PRINT_NUM_OF_LOCK_STRUCTS
|
2005-10-27 07:29:40 +00:00
|
|
|
/*************************************************************************
|
|
|
|
Calculates the number of record lock structs in the record lock hash table. */
|
|
|
|
static
|
|
|
|
ulint
|
|
|
|
lock_get_n_rec_locks(void)
|
|
|
|
/*======================*/
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
ulint n_locks = 0;
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
for (i = 0; i < hash_get_n_cells(lock_sys->rec_hash); i++) {
|
|
|
|
|
|
|
|
lock = HASH_GET_FIRST(lock_sys->rec_hash, i);
|
|
|
|
|
|
|
|
while (lock) {
|
|
|
|
n_locks++;
|
|
|
|
|
|
|
|
lock = HASH_GET_NEXT(hash, lock);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(n_locks);
|
|
|
|
}
|
2008-08-09 00:15:46 +00:00
|
|
|
#endif /* PRINT_NUM_OF_LOCK_STRUCTS */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Prints info of locks for all transactions. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_print_info_summary(
|
|
|
|
/*====================*/
|
|
|
|
FILE* file) /* in: file where to print */
|
|
|
|
{
|
|
|
|
/* We must protect the MySQL thd->query field with a MySQL mutex, and
|
|
|
|
because the MySQL mutex must be reserved before the kernel_mutex of
|
|
|
|
InnoDB, we call innobase_mysql_prepare_print_arbitrary_thd() here. */
|
|
|
|
|
|
|
|
innobase_mysql_prepare_print_arbitrary_thd();
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
if (lock_deadlock_found) {
|
2006-08-29 09:30:31 +00:00
|
|
|
fputs("------------------------\n"
|
|
|
|
"LATEST DETECTED DEADLOCK\n"
|
|
|
|
"------------------------\n", file);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_copy_file(file, lock_latest_err_file);
|
|
|
|
}
|
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
fputs("------------\n"
|
|
|
|
"TRANSACTIONS\n"
|
|
|
|
"------------\n", file);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-12-20 14:08:16 +00:00
|
|
|
fprintf(file, "Trx id counter " TRX_ID_FMT "\n",
|
|
|
|
TRX_ID_PREP_PRINTF(trx_sys->max_trx_id));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
fprintf(file,
|
2007-12-20 14:08:16 +00:00
|
|
|
"Purge done for trx's n:o < " TRX_ID_FMT
|
|
|
|
" undo n:o < " TRX_ID_FMT "\n",
|
|
|
|
TRX_ID_PREP_PRINTF(purge_sys->purge_trx_no),
|
|
|
|
TRX_ID_PREP_PRINTF(purge_sys->purge_undo_no));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
fprintf(file,
|
2006-08-29 09:30:31 +00:00
|
|
|
"History list length %lu\n",
|
|
|
|
(ulong) trx_sys->rseg_history_len);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2008-08-09 00:15:46 +00:00
|
|
|
#ifdef PRINT_NUM_OF_LOCK_STRUCTS
|
2005-10-27 07:29:40 +00:00
|
|
|
fprintf(file,
|
|
|
|
"Total number of lock structs in row lock hash table %lu\n",
|
2006-08-29 09:30:31 +00:00
|
|
|
(ulong) lock_get_n_rec_locks());
|
2008-08-09 00:15:46 +00:00
|
|
|
#endif /* PRINT_NUM_OF_LOCK_STRUCTS */
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Prints info of locks for each transaction. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
lock_print_info_all_transactions(
|
|
|
|
/*=============================*/
|
|
|
|
FILE* file) /* in: file where to print */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
ibool load_page_first = TRUE;
|
|
|
|
ulint nth_trx = 0;
|
|
|
|
ulint nth_lock = 0;
|
|
|
|
ulint i;
|
|
|
|
mtr_t mtr;
|
|
|
|
trx_t* trx;
|
|
|
|
|
|
|
|
fprintf(file, "LIST OF TRANSACTIONS FOR EACH SESSION:\n");
|
|
|
|
|
|
|
|
/* First print info on non-active transactions */
|
|
|
|
|
|
|
|
trx = UT_LIST_GET_FIRST(trx_sys->mysql_trx_list);
|
|
|
|
|
|
|
|
while (trx) {
|
|
|
|
if (trx->conc_state == TRX_NOT_STARTED) {
|
|
|
|
fputs("---", file);
|
|
|
|
trx_print(file, trx, 600);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
trx = UT_LIST_GET_NEXT(mysql_trx_list, trx);
|
|
|
|
}
|
|
|
|
|
|
|
|
loop:
|
|
|
|
trx = UT_LIST_GET_FIRST(trx_sys->trx_list);
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
/* Since we temporarily release the kernel mutex when
|
|
|
|
reading a database page in below, variable trx may be
|
|
|
|
obsolete now and we must loop through the trx list to
|
|
|
|
get probably the same trx, or some other trx. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
while (trx && (i < nth_trx)) {
|
|
|
|
trx = UT_LIST_GET_NEXT(trx_list, trx);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (trx == NULL) {
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
innobase_mysql_end_print_arbitrary_thd();
|
|
|
|
|
|
|
|
ut_ad(lock_validate());
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nth_lock == 0) {
|
|
|
|
fputs("---", file);
|
|
|
|
trx_print(file, trx, 600);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
|
|
|
if (trx->read_view) {
|
2005-10-27 07:29:40 +00:00
|
|
|
fprintf(file,
|
2006-08-29 09:30:31 +00:00
|
|
|
"Trx read view will not see trx with"
|
2007-12-20 14:08:16 +00:00
|
|
|
" id >= " TRX_ID_FMT
|
|
|
|
", sees < " TRX_ID_FMT "\n",
|
|
|
|
TRX_ID_PREP_PRINTF(
|
2006-09-19 10:14:07 +00:00
|
|
|
trx->read_view->low_limit_id),
|
2007-12-20 14:08:16 +00:00
|
|
|
TRX_ID_PREP_PRINTF(
|
2006-09-19 10:14:07 +00:00
|
|
|
trx->read_view->up_limit_id));
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (trx->que_state == TRX_QUE_LOCK_WAIT) {
|
|
|
|
fprintf(file,
|
2006-08-29 09:30:31 +00:00
|
|
|
"------- TRX HAS BEEN WAITING %lu SEC"
|
|
|
|
" FOR THIS LOCK TO BE GRANTED:\n",
|
|
|
|
(ulong) difftime(time(NULL),
|
|
|
|
trx->wait_started));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(trx->wait_lock) == LOCK_REC) {
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_print(file, trx->wait_lock);
|
|
|
|
} else {
|
|
|
|
lock_table_print(file, trx->wait_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
fputs("------------------\n", file);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!srv_print_innodb_lock_monitor) {
|
2006-02-23 19:25:29 +00:00
|
|
|
nth_trx++;
|
|
|
|
goto loop;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
/* Look at the note about the trx loop above why we loop here:
|
|
|
|
lock may be an obsolete pointer now. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock = UT_LIST_GET_FIRST(trx->trx_locks);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
while (lock && (i < nth_lock)) {
|
|
|
|
lock = UT_LIST_GET_NEXT(trx_locks, lock);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock == NULL) {
|
|
|
|
nth_trx++;
|
|
|
|
nth_lock = 0;
|
|
|
|
|
|
|
|
goto loop;
|
|
|
|
}
|
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock) == LOCK_REC) {
|
2006-02-23 19:25:29 +00:00
|
|
|
if (load_page_first) {
|
2007-01-18 09:59:00 +00:00
|
|
|
ulint space = lock->un_member.rec_lock.space;
|
|
|
|
ulint zip_size= fil_space_get_zip_size(space);
|
|
|
|
ulint page_no = lock->un_member.rec_lock.page_no;
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
innobase_mysql_end_print_arbitrary_thd();
|
|
|
|
|
|
|
|
mtr_start(&mtr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-01-18 09:59:00 +00:00
|
|
|
buf_page_get_with_no_latch(space, zip_size,
|
|
|
|
page_no, &mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
|
|
|
|
load_page_first = FALSE;
|
|
|
|
|
|
|
|
innobase_mysql_prepare_print_arbitrary_thd();
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
goto loop;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_rec_print(file, lock);
|
|
|
|
} else {
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_ad(lock_get_type_low(lock) & LOCK_TABLE);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_table_print(file, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
load_page_first = TRUE;
|
|
|
|
|
|
|
|
nth_lock++;
|
|
|
|
|
|
|
|
if (nth_lock >= 10) {
|
2006-08-29 09:30:31 +00:00
|
|
|
fputs("10 LOCKS PRINTED FOR THIS TRX:"
|
|
|
|
" SUPPRESSING FURTHER PRINTS\n",
|
|
|
|
file);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
nth_trx++;
|
|
|
|
nth_lock = 0;
|
|
|
|
|
|
|
|
goto loop;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto loop;
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
# ifdef UNIV_DEBUG
|
2005-10-27 07:29:40 +00:00
|
|
|
/*************************************************************************
|
|
|
|
Validates the lock queue on a table. */
|
2006-10-24 06:45:52 +00:00
|
|
|
static
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_table_queue_validate(
|
|
|
|
/*======================*/
|
|
|
|
/* out: TRUE if ok */
|
|
|
|
dict_table_t* table) /* in: table */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_FIRST(table->locks);
|
|
|
|
|
|
|
|
while (lock) {
|
|
|
|
ut_a(((lock->trx)->conc_state == TRX_ACTIVE)
|
2006-08-29 09:30:31 +00:00
|
|
|
|| ((lock->trx)->conc_state == TRX_PREPARED)
|
|
|
|
|| ((lock->trx)->conc_state == TRX_COMMITTED_IN_MEMORY));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!lock_get_wait(lock)) {
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
ut_a(!lock_table_other_has_incompatible(
|
|
|
|
lock->trx, 0, table,
|
|
|
|
lock_get_mode(lock)));
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
|
|
|
|
|
|
|
ut_a(lock_table_has_to_wait_in_queue(lock));
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = UT_LIST_GET_NEXT(un_member.tab_lock.locks, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Validates the lock queue on a single record. */
|
2006-10-24 06:45:52 +00:00
|
|
|
static
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_rec_queue_validate(
|
|
|
|
/*====================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: TRUE if ok */
|
|
|
|
const buf_block_t* block, /* in: buffer block containing rec */
|
|
|
|
const rec_t* rec, /* in: record to look at */
|
|
|
|
dict_index_t* index, /* in: index, or NULL if not known */
|
|
|
|
const ulint* offsets)/* in: rec_get_offsets(rec, index) */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-02-23 19:25:29 +00:00
|
|
|
trx_t* impl_trx;
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_t* lock;
|
2005-10-27 11:48:10 +00:00
|
|
|
ulint heap_no;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_a(rec);
|
2007-10-03 12:22:29 +00:00
|
|
|
ut_a(block->frame == page_align(rec));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
ut_ad(!page_rec_is_comp(rec) == !rec_offs_comp(offsets));
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
heap_no = page_rec_get_heap_no(rec);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_mutex_enter_kernel();
|
2005-10-27 11:48:10 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!page_rec_is_user_rec(rec)) {
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
while (lock) {
|
2006-08-29 09:30:31 +00:00
|
|
|
switch(lock->trx->conc_state) {
|
|
|
|
case TRX_ACTIVE:
|
|
|
|
case TRX_PREPARED:
|
|
|
|
case TRX_COMMITTED_IN_MEMORY:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ut_error;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_a(trx_in_trx_list(lock->trx));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (lock_get_wait(lock)) {
|
|
|
|
ut_a(lock_rec_has_to_wait_in_queue(lock));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (index) {
|
|
|
|
ut_a(lock->index == index);
|
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
return(TRUE);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
if (!index);
|
2006-03-09 17:26:02 +00:00
|
|
|
else if (dict_index_is_clust(index)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
impl_trx = lock_clust_rec_some_has_impl(rec, index, offsets);
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (impl_trx
|
|
|
|
&& lock_rec_other_has_expl_req(LOCK_S, 0, LOCK_WAIT,
|
|
|
|
block, heap_no, impl_trx)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
ut_a(lock_rec_has_expl(LOCK_X | LOCK_REC_NOT_GAP,
|
2006-10-24 06:45:52 +00:00
|
|
|
block, heap_no, impl_trx));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2005-10-27 11:48:10 +00:00
|
|
|
} else {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* The kernel mutex may get released temporarily in the
|
|
|
|
next function call: we have to release lock table mutex
|
|
|
|
to obey the latching order */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
impl_trx = lock_sec_rec_some_has_impl_off_kernel(
|
|
|
|
rec, index, offsets);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (impl_trx
|
|
|
|
&& lock_rec_other_has_expl_req(LOCK_S, 0, LOCK_WAIT,
|
|
|
|
block, heap_no, impl_trx)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_a(lock_rec_has_expl(LOCK_X | LOCK_REC_NOT_GAP,
|
2006-10-24 06:45:52 +00:00
|
|
|
block, heap_no, impl_trx));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, heap_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
while (lock) {
|
|
|
|
ut_a(lock->trx->conc_state == TRX_ACTIVE
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock->trx->conc_state == TRX_PREPARED
|
|
|
|
|| lock->trx->conc_state == TRX_COMMITTED_IN_MEMORY);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_a(trx_in_trx_list(lock->trx));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (index) {
|
|
|
|
ut_a(lock->index == index);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!lock_rec_get_gap(lock) && !lock_get_wait(lock)) {
|
|
|
|
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode mode;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (lock_get_mode(lock) == LOCK_S) {
|
|
|
|
mode = LOCK_X;
|
|
|
|
} else {
|
|
|
|
mode = LOCK_S;
|
|
|
|
}
|
2006-09-19 10:14:07 +00:00
|
|
|
ut_a(!lock_rec_other_has_expl_req(
|
2006-10-24 06:45:52 +00:00
|
|
|
mode, 0, 0, block, heap_no, lock->trx));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
} else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)) {
|
|
|
|
|
|
|
|
ut_a(lock_rec_has_to_wait_in_queue(lock));
|
|
|
|
}
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
lock = lock_rec_get_next(heap_no, lock);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Validates the record lock queues on a page. */
|
2006-10-24 06:45:52 +00:00
|
|
|
static
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_rec_validate_page(
|
|
|
|
/*===================*/
|
|
|
|
/* out: TRUE if ok */
|
|
|
|
ulint space, /* in: space id */
|
|
|
|
ulint page_no)/* in: page number */
|
|
|
|
{
|
|
|
|
dict_index_t* index;
|
2006-10-12 11:05:22 +00:00
|
|
|
buf_block_t* block;
|
2006-10-24 06:45:52 +00:00
|
|
|
const page_t* page;
|
2006-10-12 11:05:22 +00:00
|
|
|
lock_t* lock;
|
2006-10-24 06:45:52 +00:00
|
|
|
const rec_t* rec;
|
2006-10-12 11:05:22 +00:00
|
|
|
ulint nth_lock = 0;
|
|
|
|
ulint nth_bit = 0;
|
|
|
|
ulint i;
|
|
|
|
mtr_t mtr;
|
2005-10-27 07:29:40 +00:00
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets = offsets_;
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(!mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
mtr_start(&mtr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-01-18 09:59:00 +00:00
|
|
|
block = buf_page_get(space, fil_space_get_zip_size(space),
|
|
|
|
page_no, RW_X_LATCH, &mtr);
|
2006-10-12 11:05:22 +00:00
|
|
|
buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
|
2008-09-22 07:57:34 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
page = block->frame;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
2006-02-23 19:25:29 +00:00
|
|
|
loop:
|
2005-10-27 07:29:40 +00:00
|
|
|
lock = lock_rec_get_first_on_page_addr(space, page_no);
|
|
|
|
|
|
|
|
if (!lock) {
|
|
|
|
goto function_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < nth_lock; i++) {
|
|
|
|
|
|
|
|
lock = lock_rec_get_next_on_page(lock);
|
|
|
|
|
|
|
|
if (!lock) {
|
|
|
|
goto function_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_a(trx_in_trx_list(lock->trx));
|
|
|
|
ut_a(lock->trx->conc_state == TRX_ACTIVE
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock->trx->conc_state == TRX_PREPARED
|
|
|
|
|| lock->trx->conc_state == TRX_COMMITTED_IN_MEMORY);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
for (i = nth_bit; i < lock_rec_get_n_bits(lock); i++) {
|
|
|
|
|
|
|
|
if (i == 1 || lock_rec_get_nth_bit(lock, i)) {
|
|
|
|
|
|
|
|
index = lock->index;
|
|
|
|
rec = page_find_rec_with_heap_no(page, i);
|
2007-01-22 10:24:21 +00:00
|
|
|
ut_a(rec);
|
2005-10-27 07:29:40 +00:00
|
|
|
offsets = rec_get_offsets(rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
fprintf(stderr,
|
2006-08-29 09:30:31 +00:00
|
|
|
"Validating %lu %lu\n",
|
|
|
|
(ulong) space, (ulong) page_no);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_queue_validate(block, rec, index, offsets);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
nth_bit = i + 1;
|
|
|
|
|
|
|
|
goto loop;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
nth_bit = 0;
|
|
|
|
nth_lock++;
|
|
|
|
|
|
|
|
goto loop;
|
|
|
|
|
|
|
|
function_exit:
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
return(TRUE);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*************************************************************************
|
|
|
|
Validates the lock system. */
|
2006-10-24 06:45:52 +00:00
|
|
|
static
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
lock_validate(void)
|
|
|
|
/*===============*/
|
|
|
|
/* out: TRUE if ok */
|
|
|
|
{
|
|
|
|
lock_t* lock;
|
|
|
|
trx_t* trx;
|
|
|
|
dulint limit;
|
|
|
|
ulint space;
|
|
|
|
ulint page_no;
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
trx = UT_LIST_GET_FIRST(trx_sys->trx_list);
|
|
|
|
|
|
|
|
while (trx) {
|
|
|
|
lock = UT_LIST_GET_FIRST(trx->trx_locks);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
while (lock) {
|
2007-09-04 07:54:29 +00:00
|
|
|
if (lock_get_type_low(lock) & LOCK_TABLE) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
lock_table_queue_validate(
|
|
|
|
lock->un_member.tab_lock.table);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock = UT_LIST_GET_NEXT(trx_locks, lock);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
trx = UT_LIST_GET_NEXT(trx_list, trx);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < hash_get_n_cells(lock_sys->rec_hash); i++) {
|
|
|
|
|
|
|
|
limit = ut_dulint_zero;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
lock = HASH_GET_FIRST(lock_sys->rec_hash, i);
|
|
|
|
|
|
|
|
while (lock) {
|
|
|
|
ut_a(trx_in_trx_list(lock->trx));
|
|
|
|
|
|
|
|
space = lock->un_member.rec_lock.space;
|
|
|
|
page_no = lock->un_member.rec_lock.page_no;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
if (ut_dulint_cmp(
|
|
|
|
ut_dulint_create(space, page_no),
|
|
|
|
limit) >= 0) {
|
2005-10-27 07:29:40 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
lock = HASH_GET_NEXT(hash, lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!lock) {
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
lock_rec_validate_page(space, page_no);
|
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
limit = ut_dulint_create(space, page_no + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
2006-10-24 06:45:52 +00:00
|
|
|
# endif /* UNIV_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
|
|
/*============ RECORD LOCK CHECKS FOR ROW OPERATIONS ====================*/
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if locks of other transactions prevent an immediate insert of
|
|
|
|
a record. If they do, first tests if the query thread should anyway
|
|
|
|
be suspended for some reason; if not, then puts the transaction and
|
|
|
|
the query thread to the lock wait state and inserts a waiting request
|
|
|
|
for a gap x-lock to the lock queue. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_rec_insert_check_and_lock(
|
|
|
|
/*===========================*/
|
|
|
|
/* out: DB_SUCCESS, DB_LOCK_WAIT,
|
|
|
|
DB_DEADLOCK, or DB_QUE_THR_SUSPENDED */
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint flags, /* in: if BTR_NO_LOCKING_FLAG bit is
|
|
|
|
set, does nothing */
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_t* rec, /* in: record after which to insert */
|
2006-10-24 06:45:52 +00:00
|
|
|
buf_block_t* block, /* in/out: buffer block of rec */
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_t* index, /* in: index */
|
|
|
|
que_thr_t* thr, /* in: query thread */
|
2006-10-24 06:45:52 +00:00
|
|
|
ibool* inherit)/* out: set to TRUE if the new
|
|
|
|
inserted record maybe should inherit
|
|
|
|
LOCK_GAP type locks from the successor
|
|
|
|
record */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-24 06:45:52 +00:00
|
|
|
const rec_t* next_rec;
|
|
|
|
trx_t* trx;
|
|
|
|
lock_t* lock;
|
|
|
|
ulint err;
|
|
|
|
ulint next_rec_heap_no;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-26 13:05:45 +00:00
|
|
|
ut_ad(block->frame == page_align(rec));
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (flags & BTR_NO_LOCKING_FLAG) {
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
next_rec = page_rec_get_next(rec);
|
2008-02-18 09:53:08 +00:00
|
|
|
next_rec_heap_no = page_rec_get_heap_no(next_rec);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
branches/zip: Fast index creation: Remove the ROW_PREBUILT_OBSOLETE nonsense.
Active transactions must not switch table or index definitions on the fly,
for several reasons, including the following:
* copied indexes do not carry any history or locking information;
that is, rollbacks, read views, and record locking would be broken
* huge potential for race conditions, inconsistent reads and writes,
loss of data, and corruption
Instead of trying to track down if the table was changed during a transaction,
acquire appropriate locks that protect the creation and dropping of indexes.
innodb-index.test: Test the locking of CREATE INDEX and DROP INDEX. Test
that consistent reads work across dropped indexes.
lock_rec_insert_check_and_lock(): Relax the lock_table_has() assertion.
When inserting a record into an index, the table must be at least IX-locked.
However, when an index is being created, an IS-lock on the table is
sufficient.
row_merge_lock_table(): Add the parameter enum lock_mode mode, which must
be LOCK_X or LOCK_S.
row_merge_drop_table(): Assert that n_mysql_handles_opened == 0.
Unconditionally drop the table.
ha_innobase::add_index(): Acquire an X or S lock on the table, as appropriate.
After acquiring an X lock, assert that n_mysql_handles_opened == 1.
Remove the comments about dropping tables in the background.
ha_innobase::final_drop_index(): Acquire an X lock on the table.
dict_table_t: Remove version_number, to_be_dropped, and prebuilts.
ins_node_t: Remove table_version_number.
enum lock_mode: Move the definition from lock0lock.h to lock0types.h.
ROW_PREBUILT_OBSOLETE, row_update_prebuilt(), row_prebuilt_table_obsolete():
Remove.
row_prebuilt_t: Remove the declaration from row0types.h.
row_drop_table_for_mysql_no_commit(): Always print a warning if a table
was added to the background drop queue.
2007-12-17 15:49:59 +00:00
|
|
|
/* When inserting a record into an index, the table must be at
|
|
|
|
least IX-locked or we must be building an index, in which case
|
2008-02-18 09:53:08 +00:00
|
|
|
the table must be at least S-locked. */
|
branches/zip: Fast index creation: Remove the ROW_PREBUILT_OBSOLETE nonsense.
Active transactions must not switch table or index definitions on the fly,
for several reasons, including the following:
* copied indexes do not carry any history or locking information;
that is, rollbacks, read views, and record locking would be broken
* huge potential for race conditions, inconsistent reads and writes,
loss of data, and corruption
Instead of trying to track down if the table was changed during a transaction,
acquire appropriate locks that protect the creation and dropping of indexes.
innodb-index.test: Test the locking of CREATE INDEX and DROP INDEX. Test
that consistent reads work across dropped indexes.
lock_rec_insert_check_and_lock(): Relax the lock_table_has() assertion.
When inserting a record into an index, the table must be at least IX-locked.
However, when an index is being created, an IS-lock on the table is
sufficient.
row_merge_lock_table(): Add the parameter enum lock_mode mode, which must
be LOCK_X or LOCK_S.
row_merge_drop_table(): Assert that n_mysql_handles_opened == 0.
Unconditionally drop the table.
ha_innobase::add_index(): Acquire an X or S lock on the table, as appropriate.
After acquiring an X lock, assert that n_mysql_handles_opened == 1.
Remove the comments about dropping tables in the background.
ha_innobase::final_drop_index(): Acquire an X lock on the table.
dict_table_t: Remove version_number, to_be_dropped, and prebuilts.
ins_node_t: Remove table_version_number.
enum lock_mode: Move the definition from lock0lock.h to lock0types.h.
ROW_PREBUILT_OBSOLETE, row_update_prebuilt(), row_prebuilt_table_obsolete():
Remove.
row_prebuilt_t: Remove the declaration from row0types.h.
row_drop_table_for_mysql_no_commit(): Always print a warning if a table
was added to the background drop queue.
2007-12-17 15:49:59 +00:00
|
|
|
ut_ad(lock_table_has(trx, index->table, LOCK_IX)
|
|
|
|
|| (*index->name == TEMP_INDEX_PREFIX
|
2008-02-18 09:53:08 +00:00
|
|
|
&& lock_table_has(trx, index->table, LOCK_S)));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock = lock_rec_get_first(block, next_rec_heap_no);
|
2005-10-27 11:48:10 +00:00
|
|
|
|
|
|
|
if (UNIV_LIKELY(lock == NULL)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* We optimize CPU time usage in the simplest case */
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
if (!dict_index_is_clust(index)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Update the page max trx id field */
|
2006-10-23 18:26:10 +00:00
|
|
|
page_update_max_trx_id(block,
|
2006-10-18 11:39:31 +00:00
|
|
|
buf_block_get_page_zip(block),
|
2007-12-17 14:11:19 +00:00
|
|
|
trx->id);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-22 13:02:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
*inherit = FALSE;
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
*inherit = TRUE;
|
|
|
|
|
|
|
|
/* If another transaction has an explicit lock request which locks
|
|
|
|
the gap, waiting or granted, on the successor, the insert has to wait.
|
|
|
|
|
|
|
|
An exception is the case where the lock by the another transaction
|
|
|
|
is a gap type lock which it placed to wait for its turn to insert. We
|
|
|
|
do not consider that kind of a lock conflicting with our insert. This
|
|
|
|
eliminates an unnecessary deadlock which resulted when 2 transactions
|
|
|
|
had to wait for their insert. Both had waiting gap type lock requests
|
|
|
|
on the successor, which produced an unnecessary deadlock. */
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
if (lock_rec_other_has_conflicting(
|
|
|
|
LOCK_X | LOCK_GAP | LOCK_INSERT_INTENTION,
|
2006-10-24 06:45:52 +00:00
|
|
|
block, next_rec_heap_no, trx)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Note that we may get DB_SUCCESS also here! */
|
|
|
|
err = lock_rec_enqueue_waiting(LOCK_X | LOCK_GAP
|
2006-08-29 09:30:31 +00:00
|
|
|
| LOCK_INSERT_INTENTION,
|
2006-10-24 06:45:52 +00:00
|
|
|
block, next_rec_heap_no,
|
|
|
|
index, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
if ((err == DB_SUCCESS) && !dict_index_is_clust(index)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Update the page max trx id field */
|
2006-10-23 18:26:10 +00:00
|
|
|
page_update_max_trx_id(block,
|
2006-10-18 11:39:31 +00:00
|
|
|
buf_block_get_page_zip(block),
|
2007-12-17 14:11:19 +00:00
|
|
|
trx->id);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
{
|
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
const ulint* offsets;
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
offsets = rec_get_offsets(next_rec, index, offsets_,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
2006-10-24 06:45:52 +00:00
|
|
|
ut_ad(lock_rec_queue_validate(block,
|
|
|
|
next_rec, index, offsets));
|
2005-10-27 07:29:40 +00:00
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
If a transaction has an implicit x-lock on a record, but no explicit x-lock
|
|
|
|
set on the record, sets one for it. NOTE that in the case of a secondary
|
|
|
|
index, the kernel mutex may get temporarily released. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
lock_rec_convert_impl_to_expl(
|
|
|
|
/*==========================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
const buf_block_t* block, /* in: buffer block of rec */
|
|
|
|
const rec_t* rec, /* in: user record on page */
|
|
|
|
dict_index_t* index, /* in: index of record */
|
|
|
|
const ulint* offsets)/* in: rec_get_offsets(rec, index) */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
trx_t* impl_trx;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
ut_ad(page_rec_is_user_rec(rec));
|
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
ut_ad(!page_rec_is_comp(rec) == !rec_offs_comp(offsets));
|
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
if (dict_index_is_clust(index)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
impl_trx = lock_clust_rec_some_has_impl(rec, index, offsets);
|
|
|
|
} else {
|
2006-09-19 10:14:07 +00:00
|
|
|
impl_trx = lock_sec_rec_some_has_impl_off_kernel(
|
|
|
|
rec, index, offsets);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (impl_trx) {
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no = page_rec_get_heap_no(rec);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* If the transaction has no explicit x-lock set on the
|
|
|
|
record, set one for it */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (!lock_rec_has_expl(LOCK_X | LOCK_REC_NOT_GAP, block,
|
2006-08-29 09:30:31 +00:00
|
|
|
heap_no, impl_trx)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
lock_rec_add_to_queue(
|
|
|
|
LOCK_REC | LOCK_X | LOCK_REC_NOT_GAP,
|
2006-10-24 06:45:52 +00:00
|
|
|
block, heap_no, index, impl_trx);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if locks of other transactions prevent an immediate modify (update,
|
|
|
|
delete mark, or delete unmark) of a clustered index record. If they do,
|
|
|
|
first tests if the query thread should anyway be suspended for some
|
|
|
|
reason; if not, then puts the transaction and the query thread to the
|
|
|
|
lock wait state and inserts a waiting request for a record x-lock to the
|
|
|
|
lock queue. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_clust_rec_modify_check_and_lock(
|
|
|
|
/*=================================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: DB_SUCCESS,
|
|
|
|
DB_LOCK_WAIT, DB_DEADLOCK, or
|
|
|
|
DB_QUE_THR_SUSPENDED */
|
|
|
|
ulint flags, /* in: if BTR_NO_LOCKING_FLAG
|
|
|
|
bit is set, does nothing */
|
|
|
|
const buf_block_t* block, /* in: buffer block of rec */
|
|
|
|
const rec_t* rec, /* in: record which should be
|
|
|
|
modified */
|
|
|
|
dict_index_t* index, /* in: clustered index */
|
|
|
|
const ulint* offsets,/* in: rec_get_offsets(rec, index) */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint err;
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
2006-03-09 17:26:02 +00:00
|
|
|
ut_ad(dict_index_is_clust(index));
|
2007-10-03 12:22:29 +00:00
|
|
|
ut_ad(block->frame == page_align(rec));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (flags & BTR_NO_LOCKING_FLAG) {
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
heap_no = rec_offs_comp(offsets)
|
|
|
|
? rec_get_heap_no_new(rec)
|
|
|
|
: rec_get_heap_no_old(rec);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
ut_ad(lock_table_has(thr_get_trx(thr), index->table, LOCK_IX));
|
|
|
|
|
|
|
|
/* If a transaction has no explicit x-lock set on the record, set one
|
|
|
|
for it */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_convert_impl_to_expl(block, rec, index, offsets);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
err = lock_rec_lock(TRUE, LOCK_X | LOCK_REC_NOT_GAP,
|
|
|
|
block, heap_no, index, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
ut_ad(lock_rec_queue_validate(block, rec, index, offsets));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if locks of other transactions prevent an immediate modify (delete
|
|
|
|
mark or delete unmark) of a secondary index record. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_sec_rec_modify_check_and_lock(
|
|
|
|
/*===============================*/
|
|
|
|
/* out: DB_SUCCESS, DB_LOCK_WAIT,
|
|
|
|
DB_DEADLOCK, or DB_QUE_THR_SUSPENDED */
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint flags, /* in: if BTR_NO_LOCKING_FLAG
|
|
|
|
bit is set, does nothing */
|
|
|
|
buf_block_t* block, /* in/out: buffer block of rec */
|
|
|
|
rec_t* rec, /* in: record which should be
|
|
|
|
modified; NOTE: as this is a secondary
|
|
|
|
index, we always have to modify the
|
|
|
|
clustered index record first: see the
|
|
|
|
comment below */
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_t* index, /* in: secondary index */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
|
|
|
{
|
|
|
|
ulint err;
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-26 13:05:45 +00:00
|
|
|
ut_ad(!dict_index_is_clust(index));
|
|
|
|
ut_ad(block->frame == page_align(rec));
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (flags & BTR_NO_LOCKING_FLAG) {
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
heap_no = page_rec_get_heap_no(rec);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Another transaction cannot have an implicit lock on the record,
|
|
|
|
because when we come here, we already have modified the clustered
|
|
|
|
index record, and this would not have been possible if another active
|
|
|
|
transaction had modified this secondary index record. */
|
|
|
|
|
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
ut_ad(lock_table_has(thr_get_trx(thr), index->table, LOCK_IX));
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
err = lock_rec_lock(TRUE, LOCK_X | LOCK_REC_NOT_GAP,
|
|
|
|
block, heap_no, index, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
{
|
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
const ulint* offsets;
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets_,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
2006-10-24 06:45:52 +00:00
|
|
|
ut_ad(lock_rec_queue_validate(block, rec, index, offsets));
|
2005-10-27 07:29:40 +00:00
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
if (err == DB_SUCCESS) {
|
2006-02-22 13:02:40 +00:00
|
|
|
/* Update the page max trx id field */
|
2006-10-23 18:26:10 +00:00
|
|
|
page_update_max_trx_id(block,
|
2006-10-18 11:39:31 +00:00
|
|
|
buf_block_get_page_zip(block),
|
2006-08-29 09:30:31 +00:00
|
|
|
thr_get_trx(thr)->id);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Like the counterpart for a clustered index below, but now we read a
|
|
|
|
secondary index record. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_sec_rec_read_check_and_lock(
|
|
|
|
/*=============================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: DB_SUCCESS,
|
|
|
|
DB_LOCK_WAIT, DB_DEADLOCK, or
|
|
|
|
DB_QUE_THR_SUSPENDED */
|
|
|
|
ulint flags, /* in: if BTR_NO_LOCKING_FLAG
|
|
|
|
bit is set, does nothing */
|
|
|
|
const buf_block_t* block, /* in: buffer block of rec */
|
2007-10-22 07:49:54 +00:00
|
|
|
const rec_t* rec, /* in: user record or page
|
2006-10-24 06:45:52 +00:00
|
|
|
supremum record which should
|
|
|
|
be read or passed over by a
|
|
|
|
read cursor */
|
|
|
|
dict_index_t* index, /* in: secondary index */
|
|
|
|
const ulint* offsets,/* in: rec_get_offsets(rec, index) */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode mode, /* in: mode of the lock which
|
2006-10-24 06:45:52 +00:00
|
|
|
the read cursor should set on
|
|
|
|
records: LOCK_S or LOCK_X; the
|
|
|
|
latter is possible in
|
|
|
|
SELECT FOR UPDATE */
|
|
|
|
ulint gap_mode,/* in: LOCK_ORDINARY, LOCK_GAP, or
|
|
|
|
LOCK_REC_NOT_GAP */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint err;
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
ut_ad(!dict_index_is_clust(index));
|
2007-10-03 12:22:29 +00:00
|
|
|
ut_ad(block->frame == page_align(rec));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(page_rec_is_user_rec(rec) || page_rec_is_supremum(rec));
|
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
2008-02-18 15:45:17 +00:00
|
|
|
ut_ad(mode == LOCK_X || mode == LOCK_S);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (flags & BTR_NO_LOCKING_FLAG) {
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
heap_no = page_rec_get_heap_no(rec);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
ut_ad(mode != LOCK_X
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IX));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mode != LOCK_S
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IS));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Some transaction may have an implicit x-lock on the record only
|
|
|
|
if the max trx id for the page >= min trx id for the trx list or a
|
|
|
|
database recovery is running. */
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (((ut_dulint_cmp(page_get_max_trx_id(block->frame),
|
2006-08-29 09:30:31 +00:00
|
|
|
trx_list_get_min_trx_id()) >= 0)
|
|
|
|
|| recv_recovery_is_on())
|
|
|
|
&& !page_rec_is_supremum(rec)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_convert_impl_to_expl(block, rec, index, offsets);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
err = lock_rec_lock(FALSE, mode | gap_mode,
|
|
|
|
block, heap_no, index, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
ut_ad(lock_rec_queue_validate(block, rec, index, offsets));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if locks of other transactions prevent an immediate read, or passing
|
|
|
|
over by a read cursor, of a clustered index record. If they do, first tests
|
|
|
|
if the query thread should anyway be suspended for some reason; if not, then
|
|
|
|
puts the transaction and the query thread to the lock wait state and inserts a
|
|
|
|
waiting request for a record lock to the lock queue. Sets the requested mode
|
|
|
|
lock on the record. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_clust_rec_read_check_and_lock(
|
|
|
|
/*===============================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: DB_SUCCESS,
|
|
|
|
DB_LOCK_WAIT, DB_DEADLOCK, or
|
|
|
|
DB_QUE_THR_SUSPENDED */
|
|
|
|
ulint flags, /* in: if BTR_NO_LOCKING_FLAG
|
|
|
|
bit is set, does nothing */
|
|
|
|
const buf_block_t* block, /* in: buffer block of rec */
|
|
|
|
const rec_t* rec, /* in: user record or page
|
|
|
|
supremum record which should
|
|
|
|
be read or passed over by a
|
|
|
|
read cursor */
|
|
|
|
dict_index_t* index, /* in: clustered index */
|
|
|
|
const ulint* offsets,/* in: rec_get_offsets(rec, index) */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode mode, /* in: mode of the lock which
|
2006-10-24 06:45:52 +00:00
|
|
|
the read cursor should set on
|
|
|
|
records: LOCK_S or LOCK_X; the
|
|
|
|
latter is possible in
|
|
|
|
SELECT FOR UPDATE */
|
|
|
|
ulint gap_mode,/* in: LOCK_ORDINARY, LOCK_GAP, or
|
|
|
|
LOCK_REC_NOT_GAP */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint err;
|
2006-10-24 06:45:52 +00:00
|
|
|
ulint heap_no;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
ut_ad(dict_index_is_clust(index));
|
2007-10-03 12:22:29 +00:00
|
|
|
ut_ad(block->frame == page_align(rec));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(page_rec_is_user_rec(rec) || page_rec_is_supremum(rec));
|
|
|
|
ut_ad(gap_mode == LOCK_ORDINARY || gap_mode == LOCK_GAP
|
2006-08-29 09:30:31 +00:00
|
|
|
|| gap_mode == LOCK_REC_NOT_GAP);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
|
|
|
|
if (flags & BTR_NO_LOCKING_FLAG) {
|
|
|
|
|
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
heap_no = page_rec_get_heap_no(rec);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_mutex_enter_kernel();
|
|
|
|
|
|
|
|
ut_ad(mode != LOCK_X
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IX));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mode != LOCK_S
|
2006-08-29 09:30:31 +00:00
|
|
|
|| lock_table_has(thr_get_trx(thr), index->table, LOCK_IS));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
if (UNIV_LIKELY(heap_no != PAGE_HEAP_NO_SUPREMUM)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
lock_rec_convert_impl_to_expl(block, rec, index, offsets);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
err = lock_rec_lock(FALSE, mode | gap_mode,
|
|
|
|
block, heap_no, index, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
lock_mutex_exit_kernel();
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
ut_ad(lock_rec_queue_validate(block, rec, index, offsets));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
/*************************************************************************
|
|
|
|
Checks if locks of other transactions prevent an immediate read, or passing
|
|
|
|
over by a read cursor, of a clustered index record. If they do, first tests
|
|
|
|
if the query thread should anyway be suspended for some reason; if not, then
|
|
|
|
puts the transaction and the query thread to the lock wait state and inserts a
|
|
|
|
waiting request for a record lock to the lock queue. Sets the requested mode
|
|
|
|
lock on the record. This is an alternative version of
|
|
|
|
lock_clust_rec_read_check_and_lock() that does not require the parameter
|
|
|
|
"offsets". */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
lock_clust_rec_read_check_and_lock_alt(
|
|
|
|
/*===================================*/
|
2006-10-24 06:45:52 +00:00
|
|
|
/* out: DB_SUCCESS,
|
|
|
|
DB_LOCK_WAIT, DB_DEADLOCK, or
|
|
|
|
DB_QUE_THR_SUSPENDED */
|
|
|
|
ulint flags, /* in: if BTR_NO_LOCKING_FLAG
|
|
|
|
bit is set, does nothing */
|
|
|
|
const buf_block_t* block, /* in: buffer block of rec */
|
|
|
|
const rec_t* rec, /* in: user record or page
|
|
|
|
supremum record which should
|
|
|
|
be read or passed over by a
|
|
|
|
read cursor */
|
|
|
|
dict_index_t* index, /* in: clustered index */
|
2007-02-01 20:56:23 +00:00
|
|
|
enum lock_mode mode, /* in: mode of the lock which
|
2006-10-24 06:45:52 +00:00
|
|
|
the read cursor should set on
|
|
|
|
records: LOCK_S or LOCK_X; the
|
|
|
|
latter is possible in
|
|
|
|
SELECT FOR UPDATE */
|
|
|
|
ulint gap_mode,/* in: LOCK_ORDINARY, LOCK_GAP, or
|
|
|
|
LOCK_REC_NOT_GAP */
|
|
|
|
que_thr_t* thr) /* in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
mem_heap_t* tmp_heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets = offsets_;
|
|
|
|
ulint ret;
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &tmp_heap);
|
2006-10-24 06:45:52 +00:00
|
|
|
ret = lock_clust_rec_read_check_and_lock(flags, block, rec, index,
|
2006-08-29 09:30:31 +00:00
|
|
|
offsets, mode, gap_mode, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
if (tmp_heap) {
|
|
|
|
mem_heap_free(tmp_heap);
|
|
|
|
}
|
|
|
|
return(ret);
|
|
|
|
}
|
2007-09-03 12:16:11 +00:00
|
|
|
|
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
|
|
|
/***********************************************************************
|
|
|
|
Release the last lock from the transaction's autoinc locks. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
lock_release_autoinc_last_lock(
|
|
|
|
/*===========================*/
|
|
|
|
ib_vector_t* autoinc_locks) /* in/out: vector of AUTOINC locks */
|
|
|
|
{
|
|
|
|
ulint last;
|
|
|
|
lock_t* lock;
|
|
|
|
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
ut_a(!ib_vector_is_empty(autoinc_locks));
|
|
|
|
|
|
|
|
/* The lock to be release must be the last lock acquired. */
|
|
|
|
last = ib_vector_size(autoinc_locks) - 1;
|
|
|
|
lock = ib_vector_get(autoinc_locks, last);
|
|
|
|
|
|
|
|
/* Should have only AUTOINC locks in the vector. */
|
|
|
|
ut_a(lock_get_mode(lock) == LOCK_AUTO_INC);
|
|
|
|
ut_a(lock_get_type(lock) == LOCK_TABLE);
|
|
|
|
|
|
|
|
ut_a(lock->un_member.tab_lock.table != NULL);
|
|
|
|
|
|
|
|
/* This will remove the lock from the trx autoinc_locks too. */
|
|
|
|
lock_table_dequeue(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Release all the transaction's autoinc locks. */
|
|
|
|
UNIV_INTERN
|
|
|
|
void
|
|
|
|
lock_release_autoinc_locks(
|
|
|
|
/*=======================*/
|
|
|
|
trx_t* trx) /* in/out: transaction */
|
|
|
|
{
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
|
|
|
ut_a(trx->autoinc_locks != NULL);
|
|
|
|
|
|
|
|
/* We release the locks in the reverse order. This is to
|
|
|
|
avoid searching the vector for the element to delete at
|
|
|
|
the lower level. See (lock_table_remove_low()) for details. */
|
|
|
|
while (!ib_vector_is_empty(trx->autoinc_locks)) {
|
|
|
|
|
|
|
|
/* lock_table_remove_low() will also remove the lock from
|
|
|
|
the transaction's autoinc_locks vector. */
|
|
|
|
lock_release_autoinc_last_lock(trx->autoinc_locks);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Should release all locks. */
|
|
|
|
ut_a(ib_vector_is_empty(trx->autoinc_locks));
|
|
|
|
}
|
|
|
|
|
2007-09-04 07:54:29 +00:00
|
|
|
/***********************************************************************
|
|
|
|
Gets the type of a lock. Non-inline version for using outside of the
|
|
|
|
lock module. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-04 07:54:29 +00:00
|
|
|
ulint
|
|
|
|
lock_get_type(
|
|
|
|
/*==========*/
|
|
|
|
/* out: LOCK_TABLE or LOCK_REC */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
|
|
|
return(lock_get_type_low(lock));
|
|
|
|
}
|
|
|
|
|
2007-09-03 12:16:11 +00:00
|
|
|
/***********************************************************************
|
|
|
|
Gets the id of the transaction owning a lock. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-03 12:16:11 +00:00
|
|
|
ullint
|
|
|
|
lock_get_trx_id(
|
|
|
|
/*============*/
|
|
|
|
/* out: transaction id */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
|
|
|
return(trx_get_id(lock->trx));
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Gets the mode of a lock in a human readable string.
|
|
|
|
The string should not be free()'d or modified. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-03 12:16:11 +00:00
|
|
|
const char*
|
|
|
|
lock_get_mode_str(
|
|
|
|
/*==============*/
|
|
|
|
/* out: lock mode */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
2007-10-25 11:21:11 +00:00
|
|
|
ibool is_gap_lock;
|
|
|
|
|
|
|
|
is_gap_lock = lock_get_type_low(lock) == LOCK_REC
|
|
|
|
&& lock_rec_get_gap(lock);
|
|
|
|
|
2007-09-03 12:16:11 +00:00
|
|
|
switch (lock_get_mode(lock)) {
|
|
|
|
case LOCK_S:
|
2007-10-25 11:21:11 +00:00
|
|
|
if (is_gap_lock) {
|
|
|
|
return("S,GAP");
|
|
|
|
} else {
|
|
|
|
return("S");
|
|
|
|
}
|
2007-09-03 12:16:11 +00:00
|
|
|
case LOCK_X:
|
2007-10-25 11:21:11 +00:00
|
|
|
if (is_gap_lock) {
|
|
|
|
return("X,GAP");
|
|
|
|
} else {
|
|
|
|
return("X");
|
|
|
|
}
|
2007-09-03 12:16:11 +00:00
|
|
|
case LOCK_IS:
|
2007-10-25 11:21:11 +00:00
|
|
|
if (is_gap_lock) {
|
|
|
|
return("IS,GAP");
|
|
|
|
} else {
|
|
|
|
return("IS");
|
|
|
|
}
|
2007-09-03 12:16:11 +00:00
|
|
|
case LOCK_IX:
|
2007-10-25 11:21:11 +00:00
|
|
|
if (is_gap_lock) {
|
|
|
|
return("IX,GAP");
|
|
|
|
} else {
|
|
|
|
return("IX");
|
|
|
|
}
|
2007-09-03 12:16:11 +00:00
|
|
|
case LOCK_AUTO_INC:
|
|
|
|
return("AUTO_INC");
|
|
|
|
default:
|
|
|
|
return("UNKNOWN");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Gets the type of a lock in a human readable string.
|
|
|
|
The string should not be free()'d or modified. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-03 12:16:11 +00:00
|
|
|
const char*
|
|
|
|
lock_get_type_str(
|
|
|
|
/*==============*/
|
|
|
|
/* out: lock type */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
2007-09-04 07:54:29 +00:00
|
|
|
switch (lock_get_type_low(lock)) {
|
2007-09-03 12:16:11 +00:00
|
|
|
case LOCK_REC:
|
|
|
|
return("RECORD");
|
|
|
|
case LOCK_TABLE:
|
|
|
|
return("TABLE");
|
|
|
|
default:
|
|
|
|
return("UNKNOWN");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Gets the table on which the lock is. */
|
|
|
|
UNIV_INLINE
|
|
|
|
dict_table_t*
|
|
|
|
lock_get_table(
|
|
|
|
/*===========*/
|
|
|
|
/* out: table */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
2007-09-04 07:54:29 +00:00
|
|
|
switch (lock_get_type_low(lock)) {
|
2007-09-03 12:16:11 +00:00
|
|
|
case LOCK_REC:
|
|
|
|
return(lock->index->table);
|
|
|
|
case LOCK_TABLE:
|
|
|
|
return(lock->un_member.tab_lock.table);
|
|
|
|
default:
|
|
|
|
ut_error;
|
2008-05-14 15:43:19 +00:00
|
|
|
return(NULL);
|
2007-09-03 12:16:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Gets the id of the table on which the lock is. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-03 12:16:11 +00:00
|
|
|
ullint
|
|
|
|
lock_get_table_id(
|
|
|
|
/*==============*/
|
|
|
|
/* out: id of the table */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
|
|
|
dict_table_t* table;
|
|
|
|
|
|
|
|
table = lock_get_table(lock);
|
|
|
|
|
|
|
|
return((ullint)ut_conv_dulint_to_longlong(table->id));
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Gets the name of the table on which the lock is.
|
|
|
|
The string should not be free()'d or modified. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-03 12:16:11 +00:00
|
|
|
const char*
|
|
|
|
lock_get_table_name(
|
|
|
|
/*================*/
|
|
|
|
/* out: name of the table */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
|
|
|
dict_table_t* table;
|
|
|
|
|
|
|
|
table = lock_get_table(lock);
|
|
|
|
|
|
|
|
return(table->name);
|
|
|
|
}
|
|
|
|
|
2007-09-27 13:54:21 +00:00
|
|
|
/***********************************************************************
|
|
|
|
For a record lock, gets the index on which the lock is. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-27 13:54:21 +00:00
|
|
|
const dict_index_t*
|
|
|
|
lock_rec_get_index(
|
|
|
|
/*===============*/
|
|
|
|
/* out: index */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
|
|
|
ut_a(lock_get_type_low(lock) == LOCK_REC);
|
|
|
|
|
|
|
|
return(lock->index);
|
|
|
|
}
|
|
|
|
|
2007-09-03 12:16:11 +00:00
|
|
|
/***********************************************************************
|
|
|
|
For a record lock, gets the name of the index on which the lock is.
|
|
|
|
The string should not be free()'d or modified. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-03 12:16:11 +00:00
|
|
|
const char*
|
|
|
|
lock_rec_get_index_name(
|
|
|
|
/*====================*/
|
|
|
|
/* out: name of the index */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_a(lock_get_type_low(lock) == LOCK_REC);
|
2007-09-03 12:16:11 +00:00
|
|
|
|
|
|
|
return(lock->index->name);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
For a record lock, gets the tablespace number on which the lock is. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-03 12:16:11 +00:00
|
|
|
ulint
|
|
|
|
lock_rec_get_space_id(
|
|
|
|
/*==================*/
|
|
|
|
/* out: tablespace number */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_a(lock_get_type_low(lock) == LOCK_REC);
|
2007-09-03 12:16:11 +00:00
|
|
|
|
|
|
|
return(lock->un_member.rec_lock.space);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
For a record lock, gets the page number on which the lock is. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-03 12:16:11 +00:00
|
|
|
ulint
|
|
|
|
lock_rec_get_page_no(
|
|
|
|
/*=================*/
|
|
|
|
/* out: page number */
|
|
|
|
const lock_t* lock) /* in: lock */
|
|
|
|
{
|
2007-09-04 07:54:29 +00:00
|
|
|
ut_a(lock_get_type_low(lock) == LOCK_REC);
|
2007-09-03 12:16:11 +00:00
|
|
|
|
|
|
|
return(lock->un_member.rec_lock.page_no);
|
|
|
|
}
|