summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authoringo@mysql.com <>2006-02-06 15:15:44 +0100
committeringo@mysql.com <>2006-02-06 15:15:44 +0100
commite0098885f624adb7dcd0f2965cc00b54e3d5007f (patch)
tree86ac1cb5e291d1c456e125e1954b4cdb41d5bb49 /sql/table.h
parent810cbaf157da9e36a699a6dceacc4cd80844da81 (diff)
parent7e58102bfd69ff9c67ef5bb38ebaef7d59bebf32 (diff)
downloadmariadb-git-e0098885f624adb7dcd0f2965cc00b54e3d5007f.tar.gz
Merge mysql.com:/home/mydev/mysql-4.1-bug5390
into mysql.com:/home/mydev/mysql-5.0-bug5390
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h8
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] */