diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 14:43:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 14:43:29 +0200 |
| commit | 25161e6219de4a65b7f8776771bad2af6eb0446e (patch) | |
| tree | 28a3488cb929d63620d81d8ce4e0f42d0540ad65 /sql/table.h | |
| parent | 7930ab7e3326408e6b4d18ca057db93a8b61cc49 (diff) | |
| parent | 65350042a42b46e63d24e0e84453619d57d4e203 (diff) | |
| download | mariadb-git-25161e6219de4a65b7f8776771bad2af6eb0446e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index b8bd0c86ff4..f517f54ec82 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1892,7 +1892,7 @@ struct TABLE_LIST /* Index names in a "... JOIN ... USE/IGNORE INDEX ..." clause. */ List<Index_hint> *index_hints; TABLE *table; /* opened table */ - uint table_id; /* table id (from binlog) for opened table */ + ulonglong table_id; /* table id (from binlog) for opened table */ /* select_result for derived table to pass it from table creation to table filling procedure |