diff options
author | unknown <marko@hundin.mysql.fi> | 2005-01-28 12:18:33 +0200 |
---|---|---|
committer | unknown <marko@hundin.mysql.fi> | 2005-01-28 12:18:33 +0200 |
commit | 264f83f07612d34c53d3d4e7478d441989997bab (patch) | |
tree | ee6668b6383795ee433d0de358fdf584cafde011 /innobase/include | |
parent | 9aad0ae359881bbe39431714f30e49bbed29aa97 (diff) | |
download | mariadb-git-264f83f07612d34c53d3d4e7478d441989997bab.tar.gz |
InnoDB: Allow concurrent TRUNCATE and INSERT on a table. (Bug #8144)
innobase/include/rem0rec.ic:
Improve formatting of comments
innobase/include/trx0trx.h:
dict_operation: document the effect of setting the flag
innobase/row/row0mysql.c:
Do not set the dict_operation flag. (Bug #8144)
Allow MySQL to have open handles to the table being truncated.
sql/ha_innodb.cc:
store_lock(): Do not weaken TL_WRITE locks taken by TRUNCATE TABLE.
Diffstat (limited to 'innobase/include')
-rw-r--r-- | innobase/include/rem0rec.ic | 4 | ||||
-rw-r--r-- | innobase/include/trx0trx.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/innobase/include/rem0rec.ic b/innobase/include/rem0rec.ic index ca69b9ca871..366f1c3f77d 100644 --- a/innobase/include/rem0rec.ic +++ b/innobase/include/rem0rec.ic @@ -526,7 +526,7 @@ bits of a record. (Only compact records have status bits.) */ UNIV_INLINE ulint rec_get_info_and_status_bits( -/*==============*/ +/*=========================*/ /* out: info bits */ rec_t* rec, /* in: physical record */ ibool comp) /* in: TRUE=compact page format */ @@ -550,7 +550,7 @@ bits of a record. (Only compact records have status bits.) */ UNIV_INLINE void rec_set_info_and_status_bits( -/*==============*/ +/*=========================*/ rec_t* rec, /* in: physical record */ ibool comp, /* in: TRUE=compact page format */ ulint bits) /* in: info bits */ diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 76b051105de..b63afdd526c 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -383,7 +383,9 @@ struct trx_struct{ dulint commit_lsn; /* lsn at the time of the commit */ ibool dict_operation; /* TRUE if the trx is used to create a table, create an index, or drop a - table */ + table. This is a hint that the table + may need to be dropped in crash + recovery. */ dulint table_id; /* table id if the preceding field is TRUE */ /*------------------------------*/ |