summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authoringo@mysql.com <>2006-01-23 19:19:29 +0100
committeringo@mysql.com <>2006-01-23 19:19:29 +0100
commit7e58102bfd69ff9c67ef5bb38ebaef7d59bebf32 (patch)
tree1d6a2586cc6dbd78e7aa54ba1b374e9d00f5e551 /sql/table.h
parentd8c1691456156ebaf91805ef66353e0b5cd5d251 (diff)
parent87f9c10db5cfb19e28cc36a82840985d6cac1206 (diff)
downloadmariadb-git-7e58102bfd69ff9c67ef5bb38ebaef7d59bebf32.tar.gz
Merge mysql.com:/home/mydev/mysql-4.0-bug5390
into mysql.com:/home/mydev/mysql-4.1-bug5390
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h
index 77153e5d8cd..8cb15d3a69c 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -138,6 +138,9 @@ struct st_table {
uint next_number_index;
uint blob_ptr_size; /* 4 or 8 */
uint next_number_key_offset;
+ uint lock_position; /* Position in MYSQL_LOCK.table */
+ uint lock_data_start; /* Start pos. in MYSQL_LOCK.locks */
+ uint lock_count; /* Number of locks */
int current_lock; /* Type of lock on table */
enum tmp_table_type tmp_table;
my_bool copy_blobs; /* copy_blobs when storing */