diff options
| author | unknown <sergefp@mysql.com> | 2006-05-13 22:40:26 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2006-05-13 22:40:26 +0400 |
| commit | 44de69cfdd696552bd396195b2e9e6cc9335993e (patch) | |
| tree | cf617272c790676db2d9d31fafe84e12b571cd89 /sql/table.h | |
| parent | bd7e4cad10a1e043983c4c83d8ff5959dc4e4b7a (diff) | |
| parent | 3fa6432b09be41ddcc8dae2a8e12eacab5bb95a2 (diff) | |
| download | mariadb-git-44de69cfdd696552bd396195b2e9e6cc9335993e.tar.gz | |
Merge mysql.com:/home/psergey/tmp_merge3
into mysql.com:/home/psergey/mysql-5.1-merge2
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
sql/opt_range.cc:
Manual merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 760e94b5bd5..ffecc60b19c 100644 --- a/sql/table.h +++ b/sql/table.h @@ -264,6 +264,7 @@ struct st_table { ha_rows quick_rows[MAX_KEY]; key_part_map const_key_parts[MAX_KEY]; uint quick_key_parts[MAX_KEY]; + uint quick_n_ranges[MAX_KEY]; /* If this table has TIMESTAMP field with auto-set property (pointed by |