summaryrefslogtreecommitdiff
path: root/sql/rpl_tblmap.h
diff options
context:
space:
mode:
authorAndrei Elkin <andrei.elkin@mariadb.com>2019-01-24 16:57:29 +0200
committerAndrei Elkin <andrei.elkin@mariadb.com>2019-01-25 13:42:27 +0200
commitef0b91ea941785be1f3913fc44ba735d5d03a6f6 (patch)
tree8374259326c133edfa4be708e2b333f710fa18b6 /sql/rpl_tblmap.h
parent5d48ea7d07b481ae3930486b4b039e1454273190 (diff)
downloadmariadb-git-ef0b91ea941785be1f3913fc44ba735d5d03a6f6.tar.gz
MDEV-17803: ulonglongization of table_mapping entry::table_id to fix windows compilation in particular.
Diffstat (limited to 'sql/rpl_tblmap.h')
-rw-r--r--sql/rpl_tblmap.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/rpl_tblmap.h b/sql/rpl_tblmap.h
index 9fb1c4afbd7..05b298e6053 100644
--- a/sql/rpl_tblmap.h
+++ b/sql/rpl_tblmap.h
@@ -70,10 +70,10 @@ public:
table_mapping();
~table_mapping();
- TABLE* get_table(ulong table_id);
+ TABLE* get_table(ulonglong table_id);
- int set_table(ulong table_id, TABLE* table);
- int remove_table(ulong table_id);
+ int set_table(ulonglong table_id, TABLE* table);
+ int remove_table(ulonglong table_id);
void clear_tables();
ulong count() const { return m_table_ids.records; }
@@ -83,14 +83,14 @@ private:
it, which only works for PODs)
*/
struct entry {
- ulong table_id;
+ ulonglong table_id;
union {
TABLE *table;
entry *next;
};
};
- entry *find_entry(ulong table_id)
+ entry *find_entry(ulonglong table_id)
{
return (entry *) my_hash_search(&m_table_ids,
(uchar*)&table_id,