merged fixes for BUG#39934 to 5.1-rpl+3

Also renamed current_stmt_binlog_row_based to
current_stmt_binlog_format_row for consistency

2 files changed, 11 insertions, 5 deletions

diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 604722c3c8c..2c7512afda5 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -355,7 +355,13 @@ int ha_example::close(void)
 int ha_example::write_row(uchar *buf)
 {
   DBUG_ENTER("ha_example::write_row");
-  DBUG_RETURN(HA_ERR_WRONG_COMMAND);
+  /*
+    Example of a successful write_row. We don't store the data
+    anywhere; they are thrown away. A real implementation will
+    probably need to do something with 'buf'. We report a success
+    here, to pretend that the insert was successful.
+  */
+  DBUG_RETURN(0);
 }
 
 
diff --git a/storage/example/ha_example.h b/storage/example/ha_example.h
index ec3987ced5d..e565bd5ffba 100644
--- a/storage/example/ha_example.h
+++ b/storage/example/ha_example.h
@@ -83,11 +83,11 @@ public:
   ulonglong table_flags() const
   {
     /*
-      We are saying that this engine is just row capable to have an
-      engine that can only handle row-based logging. This is used in
-      testing.
+      We are saying that this engine is just statement capable to have
+      an engine that can only handle statement-based logging. This is
+      used in testing.
     */
-    return HA_BINLOG_ROW_CAPABLE;
+    return HA_BINLOG_STMT_CAPABLE;
   }
 
   /** @brief