Merge three Percona patches into mariadb-5.2-rpl:

 - MWL#47, allowing to annotate row-based binlog events with the SQL test of
   the originating query (eg. in mysqlbinlog output).

 - row_based_replication_without_primary_key.patch, providing more intelligent
   selection of index to use on slave when applying row-based binlog events
   for tables with no primary key.

 - Make mysqlbinlog omit redundant `use` around BEGIN/SAVEPOINT/COMMIT/
   ROLLBACK in 5.0 binlogs.

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/log.h b/sql/log.h
index a7e5ea6fc8c..601ffae31c9 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -467,7 +467,8 @@ public:
   void new_file();
 
   void reset_gathered_updates(THD *thd);
-  bool write(Log_event* event_info); // binary log write
+  bool write(Log_event* event_info,
+             my_bool *with_annotate= 0); // binary log write
   bool write_transaction_to_binlog(THD *thd, binlog_trx_data *trx_data,
                                    Log_event *end_ev, bool all);