diff options
author | Alexander Barkov <bar@mariadb.org> | 2017-10-02 22:35:13 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2017-10-02 22:35:13 +0400 |
commit | 8ae8cd63485eb063de0b70ea6f3acf7102a61fef (patch) | |
tree | 70fa448baa769b6c8c331063a61bf929ad61c976 /sql/event_data_objects.cc | |
parent | 6857cb57fe7090f131b272f31485b7a478a0b324 (diff) | |
parent | 387bdf07ae0973bc3e4dc3f5064d2a29c64bb769 (diff) | |
download | mariadb-git-8ae8cd63485eb063de0b70ea6f3acf7102a61fef.tar.gz |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/event_data_objects.cc')
-rw-r--r-- | sql/event_data_objects.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 2ab06fb34f2..4df981700ef 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -561,7 +561,7 @@ Event_queue_element::load_from_row(THD *thd, TABLE *table) } if ((ptr= get_field(&mem_root, table->field[ET_FIELD_ORIGINATOR])) == NullS) DBUG_RETURN(TRUE); - originator = table->field[ET_FIELD_ORIGINATOR]->val_int(); + originator = (uint32) table->field[ET_FIELD_ORIGINATOR]->val_int(); /* ToDo : Andrey . Find a way not to allocate ptr on event_mem_root */ if ((ptr= get_field(&mem_root, @@ -911,9 +911,9 @@ Event_queue_element::compute_next_execution_time() { my_time_t time_now; DBUG_ENTER("Event_queue_element::compute_next_execution_time"); - DBUG_PRINT("enter", ("starts: %lu ends: %lu last_executed: %lu this: 0x%lx", + DBUG_PRINT("enter", ("starts: %lu ends: %lu last_executed: %lu this: %p", (long) starts, (long) ends, (long) last_executed, - (long) this)); + this)); if (status != Event_parse_data::ENABLED) { |