diff options
| author | unknown <mats@mysql.com> | 2006-02-28 10:06:58 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-02-28 10:06:58 +0100 |
| commit | 4e31551b929ca091d9d78969cfc6cdf15b9282d5 (patch) | |
| tree | cb6ade436bf4b0cf01026964400f9aa8fb2f4ff9 /sql/table.h | |
| parent | 594ba86bc534f1f81cdb897a9a414ba8248a0aad (diff) | |
| parent | d11aa8345db0801c62fcf966bfce6c4d7eda63f8 (diff) | |
| download | mariadb-git-4e31551b929ca091d9d78969cfc6cdf15b9282d5.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.1-new
into mysql.com:/home/bk/w3023-mysql-5.1-new
configure.in:
Auto merged
BitKeeper/deleted/.del-sp_notembedded.test:
Auto merged
mysql-test/extra/binlog_tests/binlog.test:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 2bde68e5919..d2a0a404884 100644 --- a/sql/table.h +++ b/sql/table.h @@ -547,7 +547,8 @@ typedef struct st_table_list struct st_table_list *next_name_resolution_table; /* Index names in a "... JOIN ... USE/IGNORE INDEX ..." clause. */ List<String> *use_index, *ignore_index; - TABLE *table; /* opened table */ + TABLE *table; /* opened table */ + uint table_id; /* table id (from binlog) for opened table */ /* select_result for derived table to pass it from table creation to table filling procedure |