diff options
| author | unknown <mats@mysql.com> | 2006-03-07 10:00:13 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-03-07 10:00:13 +0100 |
| commit | 40e371d2b677601d1170d88d9c359fbb35308562 (patch) | |
| tree | aeb10029d4188b7a4f0951f230f363e91e11a2b7 /sql/table.h | |
| parent | 4243da09055429178444ce983599114aa3252f46 (diff) | |
| parent | ac2b587029632535fac71c00f037d90dc4148611 (diff) | |
| download | mariadb-git-40e371d2b677601d1170d88d9c359fbb35308562.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
mysql-test/r/rpl_row_create_table.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.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 930777d1993..688154dd8fc 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 |