diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 11:40:02 +0200 |
commit | 081fd8bfa280635a7e699a17b035032460cb5160 (patch) | |
tree | d5ea2c0f31aafe566d749f6dd60f5bc631f60862 /sql/table.h | |
parent | 09cea8703f3ec4e4f9e23855a339c9e3d5e84d3b (diff) | |
parent | a193c5720ea461ce82390af3fe9c292581242223 (diff) | |
download | mariadb-git-081fd8bfa280635a7e699a17b035032460cb5160.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 85b63eda010..13acae533f7 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 */ - ulong 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 |