summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorunknown <andrey@lmy004.>2006-02-14 17:05:36 +0100
committerunknown <andrey@lmy004.>2006-02-14 17:05:36 +0100
commit752cadd45379e9c36ff8c6cc29ba64a823216530 (patch)
tree59bdc70b2c14fdc871f15349eb18e49c53bbcd99 /sql/table.h
parentf36bcd0e95a17183deecfeda663d424c5cdd9a7c (diff)
parent8d4f74be2d9b00e435fb22475414a0a68729092f (diff)
downloadmariadb-git-752cadd45379e9c36ff8c6cc29ba64a823216530.tar.gz
manual merge
mysql-test/r/events.result: Auto merged mysql-test/t/events.test: Auto merged sql/event.h: Auto merged sql/event_executor.cc: Auto merged sql/event_timed.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h
index 3a017983ff9..d5f09d1c216 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -866,4 +866,15 @@ typedef struct st_open_table_list{
uint32 in_use,locked;
} OPEN_TABLE_LIST;
+typedef struct st_table_field_w_type
+{
+ LEX_STRING name;
+ LEX_STRING type;
+ LEX_STRING cset;
+} TABLE_FIELD_W_TYPE;
+
+my_bool
+table_check_intact(TABLE *table, uint table_f_count,
+ TABLE_FIELD_W_TYPE *table_def, time_t *last_create_time,
+ int error_num);