diff options
| author | unknown <ingo@mysql.com> | 2006-01-23 19:19:29 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-01-23 19:19:29 +0100 |
| commit | cfbb86034d284c8c24a63725735f17cf00304b3b (patch) | |
| tree | 1d6a2586cc6dbd78e7aa54ba1b374e9d00f5e551 /sql/table.h | |
| parent | 6d5674dcd39917bff04be3c73570f66bc2aa05a4 (diff) | |
| parent | 15ecf9228a3ba5e65f39cf87f941d0d997683dc6 (diff) | |
| download | mariadb-git-cfbb86034d284c8c24a63725735f17cf00304b3b.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-bug5390
into mysql.com:/home/mydev/mysql-4.1-bug5390
sql/table.h:
Auto merged
mysql-test/r/lock.result:
BUG#5390 - problems with merge tables
Manual merge from 4.0.
mysql-test/t/lock.test:
BUG#5390 - problems with merge tables
Manual merge from 4.0.
sql/lock.cc:
BUG#5390 - problems with merge tables
Manual merge from 4.0.
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 3 |
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 */ |