summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorunknown <serg@janus.mylan>2007-03-16 20:33:27 +0100
committerunknown <serg@janus.mylan>2007-03-16 20:33:27 +0100
commit929b7b1b5ff811d1a06c1c9cea5b58e008e20c8f (patch)
tree5c776e7835969b55a2ad2ba1f861c8ad843a8a9d /sql/table.h
parent68f09e779291c0f48bcc79d7699dd708fda32c32 (diff)
parenta2630174940dfe4be437503eb82d07838b54cda2 (diff)
downloadmariadb-git-929b7b1b5ff811d1a06c1c9cea5b58e008e20c8f.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1 sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h
index 086df5f28f8..d15929e8cba 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -199,6 +199,7 @@ typedef struct st_table_share
uint primary_key;
uint next_number_index;
uint next_number_key_offset;
+ uint next_number_keypart;
uint error, open_errno, errarg; /* error from open_table_def() */
uint column_bitmap_size;
uchar frm_version;