[Commits] Rev 4131: Merge in file:///home/psergey/dev2/10.0/

Sergey Petrunya psergey at askmonty.org
Fri Mar 28 20:19:17 EET 2014


At file:///home/psergey/dev2/10.0/

------------------------------------------------------------
revno: 4131 [merge]
revision-id: psergey at askmonty.org-20140328181916-ehyb4hrvmsi6zt9t
parent: sergii at pisem.net-20140327222328-5shz92qe17rudh7x
parent: psergey at askmonty.org-20140328181757-z5gp8obycjzuu9d5
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: 10.0
timestamp: Fri 2014-03-28 22:19:16 +0400
message:
  Merge
modified:
  sql/log_event.cc               sp1f-log_event.cc-19700101030959-msmqlflsngxosswid2hpzxly5vfqdddc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2014-03-23 15:00:29 +0000
+++ b/sql/log_event.cc	2014-03-28 18:17:57 +0000
@@ -10808,13 +10808,15 @@ int Table_map_log_event::do_apply_event(
   table_list->table_id= DBUG_EVALUATE_IF("inject_tblmap_same_id_maps_diff_table", 0, m_table_id);
   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));
 #ifdef RBR_TRIGGERS
   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));
 #endif //RBR_TRIGGERS
-  DBUG_PRINT("debug", ("table: %s is mapped to %u%s",
-                       table_list->table_name, table_list->table_id,
-                       (table_list->master_had_triggers ?
-                        " (master had triggers)" : "")));
+
   enum_tbl_map_status tblmap_status= check_table_map(rgi, table_list);
   if (tblmap_status == OK_TO_PROCESS)
   {



More information about the commits mailing list