diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-03-16 10:38:35 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-03-16 10:38:35 +0200 |
| commit | e8cc84628baa32bdede57d94e006a3785c161708 (patch) | |
| tree | 1726835dbb61c834110b5480ed4a6510faedbeff /sql/table.h | |
| parent | dad9a12b3d0099823f9d3350bb72067123a97c25 (diff) | |
| parent | 5c6902a49562d4ddd625a10e069daf961b890b20 (diff) | |
| download | mariadb-git-e8cc84628baa32bdede57d94e006a3785c161708.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4
into sanja.is.com.ua:/home/bell/mysql/work.etalon
sql/sql_class.h:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/table.h b/sql/table.h index 16a42cd58a4..209333c24b7 100644 --- a/sql/table.h +++ b/sql/table.h @@ -112,7 +112,7 @@ struct st_table { char *table_name,*real_name,*path; uint key_length; /* Length of key */ uint tablenr,used_fields,null_bytes; - table_map map; + table_map map; /* ID bit of table (1,2,4,8,16...) */ ulong version,flush_version; uchar *null_flags; IO_CACHE *io_cache; /* If sorted trough file*/ @@ -141,13 +141,14 @@ typedef struct st_table_list { uint32 db_length, real_name_length; Item *on_expr; /* Used with outer join */ struct st_table_list *natural_join; /* natural join on this table*/ - List<String> *use_index,*ignore_index; + /* ... join ... USE INDEX ... IGNORE INDEX */ + List<String> *use_index,*ignore_index; TABLE *table; GRANT_INFO grant; thr_lock_type lock_type; uint outer_join; /* Which join type */ bool straight; /* optimize with prev table */ - bool updating; /* for replicate-do/ignore table */ + bool updating; /* for replicate-do/ignore table */ bool shared; /* Used twice in union */ } TABLE_LIST; |