diff options
| author | unknown <ingo@mysql.com> | 2006-02-06 15:15:44 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-02-06 15:15:44 +0100 |
| commit | 0e88bff6cb73f1e95ad6683d45626fadef41f35d (patch) | |
| tree | 86ac1cb5e291d1c456e125e1954b4cdb41d5bb49 /sql/table.h | |
| parent | b948741b6beebb024ae4df23107f9e1f016cb14f (diff) | |
| parent | cfbb86034d284c8c24a63725735f17cf00304b3b (diff) | |
| download | mariadb-git-0e88bff6cb73f1e95ad6683d45626fadef41f35d.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1-bug5390
into mysql.com:/home/mydev/mysql-5.0-bug5390
mysql-test/r/lock.result:
Auto merged
mysql-test/t/lock.test:
Auto merged
sql/lock.cc:
BUG#5390 - problems with merge tables
Manual merge
sql/table.h:
BUG#5390 - problems with merge tables
Manual merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 78a942ef301..62990a966cc 100644 --- a/sql/table.h +++ b/sql/table.h @@ -235,6 +235,14 @@ struct st_table { timestamp_auto_set_type timestamp_field_type; table_map map; /* ID bit of table (1,2,4,8,16...) */ + 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; uint tablenr,used_fields; uint temp_pool_slot; /* Used by intern temp tables */ uint status; /* What's in record[0] */ |