diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 15:57:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 15:59:00 +0200 |
| commit | fab531a150ec588f87e8a636d2ba1ecbfffdb08e (patch) | |
| tree | 701f84bf8f59b4839631061fd7fb307360fe8cc5 | |
| parent | 25161e6219de4a65b7f8776771bad2af6eb0446e (diff) | |
| download | mariadb-git-fab531a150ec588f87e8a636d2ba1ecbfffdb08e.tar.gz | |
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.
| -rw-r--r-- | sql/log_event.cc | 6 | ||||
| -rw-r--r-- | sql/table.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 28374fdd8c9..f6b89cd1a80 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2018, Oracle and/or its affiliates. - Copyright (c) 2009, 2018, MariaDB + Copyright (c) 2009, 2019, MariaDB This program is free software; you can redistribute it and/or modify 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) table_list->updating= 1; table_list->required_type= FRMTYPE_TABLE; - DBUG_PRINT("debug", ("table: %s is mapped to %u", table_list->table_name, - table_list->table_id)); + DBUG_PRINT("debug", ("table: %s is mapped to %lu", table_list->table_name, + table_list->table_id)); table_list->master_had_triggers= ((m_flags & TM_BIT_HAS_TRIGGERS_F) ? 1 : 0); DBUG_PRINT("debug", ("table->master_had_triggers=%d", (int)table_list->master_had_triggers)); diff --git a/sql/table.h b/sql/table.h index f517f54ec82..85b63eda010 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1,7 +1,7 @@ #ifndef TABLE_INCLUDED #define TABLE_INCLUDED /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2009, 2018, MariaDB + Copyright (c) 2009, 2019, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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 */ - ulonglong table_id; /* table id (from binlog) for opened table */ + ulong table_id; /* table id (from binlog) for opened table */ /* select_result for derived table to pass it from table creation to table filling procedure |