Merge branch '10.1' of github.com:MariaDB/server into 10.1

Conflicts:
	sql/item_subselect.cc

Fixed also typo in comment

1 files changed, 0 insertions, 21 deletions

diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h
index 6be3d7cf4ec..41e1fcf460c 100644
--- a/sql/rpl_injector.h
+++ b/sql/rpl_injector.h
@@ -181,27 +181,6 @@ public:
       int use_table(server_id_type sid, table tbl);
 
       /*
-        Add a 'write row' entry to the transaction.
-      */
-      int write_row (server_id_type sid, table tbl, 
-                     MY_BITMAP const *cols, size_t colcnt,
-                     record_type record);
-
-      /*
-        Add a 'delete row' entry to the transaction.
-      */
-      int delete_row(server_id_type sid, table tbl, 
-                     MY_BITMAP const *cols, size_t colcnt,
-                     record_type record);
-
-      /*
-        Add an 'update row' entry to the transaction.
-      */
-      int update_row(server_id_type sid, table tbl, 
-                     MY_BITMAP const *cols, size_t colcnt,
-                     record_type before, record_type after);
-
-      /*
         Commit a transaction.
 
         This member function will clean up after a sequence of *_row calls by,