table->write_set was changed if binary logging was used, which caused the

changes in query execution plans.
Fixed by introducing table->rpl_write_set which holds which columns should
be stored in the binary log.

Other things:
- Removed some not needed references to read_set and write_set to make
  code really changing read_set and write_set easier to read
  (in opt_range.cc)
- Added error handling of failed unpack_current_row()
- Added missing call to mark_columns_needed_for_insert() for DELAYED INSERT
- Removed not used functions in_read_set() and in_write_set()
- In rpl_record.cc, removed not used variable error

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index 94f54d6ccc3..498aa8d8d28 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -4304,7 +4304,7 @@ public:
                  bitmap_cmp return logic).
 
    */
-  virtual bool read_write_bitmaps_cmp(TABLE *table)
+  bool read_write_bitmaps_cmp(TABLE *table)
   {
     bool res= FALSE;
 
@@ -4315,10 +4315,10 @@ public:
         break;
       case UPDATE_ROWS_EVENT:
         res= (bitmap_cmp(get_cols(), table->read_set) &&
-              bitmap_cmp(get_cols_ai(), table->write_set));
+              bitmap_cmp(get_cols_ai(), table->rpl_write_set));
         break;
       case WRITE_ROWS_EVENT:
-        res= bitmap_cmp(get_cols(), table->write_set);
+        res= bitmap_cmp(get_cols(), table->rpl_write_set);
         break;
       default:
         /*