diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-07 13:59:31 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-07 13:59:31 +0100 |
| commit | 65c5ef9b495bac078ad2a502a75801c7cfe5b95a (patch) | |
| tree | 266859fc4e22dcd18112a25e8a3e4f9d93a043a0 /sql/table.h | |
| parent | 7293ce0ee81f05b1ec3ac9ddcc88bfbee4030e55 (diff) | |
| parent | 625994b7cc4ebd0bc2652ae80b93386aa4b766ac (diff) | |
| download | mariadb-git-65c5ef9b495bac078ad2a502a75801c7cfe5b95a.tar.gz | |
dirty merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sql/table.h b/sql/table.h index f33f5e048c2..9156390a0eb 100644 --- a/sql/table.h +++ b/sql/table.h @@ -638,16 +638,6 @@ struct TABLE_SHARE LEX_CSTRING normalized_path; /* unpack_filename(path) */ LEX_CSTRING connect_string; - const char* orig_table_name; /* Original table name for this tmp table */ - const char* error_table_name() const /* Get table name for error messages */ - { - return tmp_table ? ( - orig_table_name ? - orig_table_name : - "(temporary)") : - table_name.str; - } - /* Set of keys in use, implemented as a Bitmap. Excludes keys disabled by ALTER TABLE ... DISABLE KEYS. @@ -2082,7 +2072,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 |