Skip to content

Commit fab531a

Browse files
committed
Fix the build after MDEV-17803
Use the same data type 'ulong' to avoid type mismatch on Windows and on 32-bit systems. FIXME: The correct data type should probably be 64-bit.
1 parent 25161e6 commit fab531a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

sql/log_event.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Copyright (c) 2000, 2018, Oracle and/or its affiliates.
3-
Copyright (c) 2009, 2018, MariaDB
3+
Copyright (c) 2009, 2019, MariaDB
44
55
This program is free software; you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by
@@ -12093,8 +12093,8 @@ int Table_map_log_event::do_apply_event(rpl_group_info *rgi)
1209312093
table_list->updating= 1;
1209412094
table_list->required_type= FRMTYPE_TABLE;
1209512095

12096-
DBUG_PRINT("debug", ("table: %s is mapped to %u", table_list->table_name,
12097-
table_list->table_id));
12096+
DBUG_PRINT("debug", ("table: %s is mapped to %lu", table_list->table_name,
12097+
table_list->table_id));
1209812098
table_list->master_had_triggers= ((m_flags & TM_BIT_HAS_TRIGGERS_F) ? 1 : 0);
1209912099
DBUG_PRINT("debug", ("table->master_had_triggers=%d",
1210012100
(int)table_list->master_had_triggers));

sql/table.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef TABLE_INCLUDED
22
#define TABLE_INCLUDED
33
/* Copyright (c) 2000, 2017, Oracle and/or its affiliates.
4-
Copyright (c) 2009, 2018, MariaDB
4+
Copyright (c) 2009, 2019, MariaDB
55
66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by
@@ -1892,7 +1892,7 @@ struct TABLE_LIST
18921892
/* Index names in a "... JOIN ... USE/IGNORE INDEX ..." clause. */
18931893
List<Index_hint> *index_hints;
18941894
TABLE *table; /* opened table */
1895-
ulonglong table_id; /* table id (from binlog) for opened table */
1895+
ulong table_id; /* table id (from binlog) for opened table */
18961896
/*
18971897
select_result for derived table to pass it from table creation to table
18981898
filling procedure

0 commit comments

Comments
 (0)