BUG#22864 (CREATE-SELECT does not work correctly):

Post-merge fixes.


sql/log.cc:
  Removing HAVE_ROW_BASED_REPLICATION from file.

sql/log.cc

@@ -148,7 +148,6 @@ class binlog_trx_data {
    */
   void truncate(my_off_t pos)
   {
-#ifdef HAVE_ROW_BASED_REPLICATION
     DBUG_PRINT("info", ("truncating to position %lu", pos));
     DBUG_PRINT("info", ("before_stmt_pos=%lu", pos));
     delete pending();
@@ -156,7 +155,6 @@ class binlog_trx_data {
     reinit_io_cache(&trans_log, WRITE_CACHE, pos, 0, 0);
     if (pos < before_stmt_pos)
       before_stmt_pos= MY_OFF_T_UNDEF;
-#endif
   }
 
   /*