diff options
| author | unknown <serg@serg.mylan> | 2004-04-02 23:50:41 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-04-02 23:50:41 +0200 |
| commit | 6b433f99a4dd717e3274c26f5727c6aa14663f75 (patch) | |
| tree | 50c9a9de7e7a6d6ad79986d1c33e9df44a9490b4 /sql/table.h | |
| parent | 8abda715d4d6bf75bb4470c7acc86b9dd224012e (diff) | |
| parent | b2cf48ab5aded5cfd14351b1a97a47af0b3615a3 (diff) | |
| download | mariadb-git-6b433f99a4dd717e3274c26f5727c6aa14663f75.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/ha_myisam.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.h b/sql/table.h index 537e31a202a..b595887820a 100644 --- a/sql/table.h +++ b/sql/table.h @@ -121,7 +121,7 @@ struct st_table { my_bool maybe_null,outer_join; /* Used with OUTER JOIN */ my_bool force_index; my_bool distinct,const_table,no_rows; - my_bool key_read, bulk_insert; + my_bool key_read; my_bool crypted; my_bool db_low_byte_first; /* Portable row format */ my_bool locked_by_flush; @@ -131,7 +131,7 @@ struct st_table { my_bool is_view; my_bool no_keyread, no_cache; my_bool clear_query_id; /* To reset query_id for tables and cols */ - my_bool auto_increment_field_not_null; + my_bool auto_increment_field_not_null; Field *next_number_field, /* Set if next_number is activated */ *found_next_number_field, /* Set on open */ *rowid_field; |