Commit acefe209 authored by unknown's avatar unknown
Browse files

After review fixes

parent bf7c15d0

sql/ha_ndbcluster.cc

+0 −1
Original line number Diff line number Diff line
@@ -4212,7 +4212,6 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg): 
  m_table_info(NULL),

  m_table_flags(HA_REC_NOT_IN_SEQ |

                HA_NULL_IN_KEY |

                HA_CAN_SCAN_UPDATED_INDEX |

                HA_AUTO_PART_KEY |

                HA_NO_PREFIX_CHAR_KEYS |

                HA_NEED_READ_RANGE_BUFFER |

sql/handler.h

+62 −3
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
#define HA_NO_VARCHAR	       (1 << 27)

#define HA_CAN_BIT_FIELD       (1 << 28) /* supports bit fields */

#define HA_NEED_READ_RANGE_BUFFER (1 << 29) /* for read_multi_range */

#define HA_CAN_SCAN_UPDATED_INDEX (1 << 31)





/* bits in index_flags(index_number) for what you can do with index */
@@ -568,20 +567,80 @@ class handler :public Sql_alloc 
   { return  HA_ERR_WRONG_COMMAND; }

  virtual int delete_row(const byte * buf)

   { return  HA_ERR_WRONG_COMMAND; }

  virtual bool start_bulk_update() { return FALSE; }

  virtual bool start_bulk_delete() { return FALSE; }

  /*

    SYNOPSIS

      start_bulk_update()

    RETURN

      0   Bulk update used by handler

      1   Bulk update not used, normal operation used

  */

  virtual bool start_bulk_update() { return 1; }

  /*

    SYNOPSIS

      start_bulk_delete()

    RETURN

      0   Bulk delete used by handler

      1   Bulk delete not used, normal operation used

  */

  virtual bool start_bulk_delete() { return 1; }

  /*

    SYNOPSIS

    This method is similar to update_row, however the handler doesn't need

    to execute the updates at this point in time. The handler can be certain

    that another call to bulk_update_row will occur OR a call to

    exec_bulk_update before the set of updates in this query is concluded.



      bulk_update_row()

        old_data       Old record

        new_data       New record

        dup_key_found  Number of duplicate keys found

    RETURN

      0   Bulk delete used by handler

      1   Bulk delete not used, normal operation used

  */

  virtual int bulk_update_row(const byte *old_data, byte *new_data,

                              uint *dup_key_found)

  {

    DBUG_ASSERT(FALSE);

    return HA_ERR_WRONG_COMMAND;

  }

  /*

    SYNOPSIS

    After this call all outstanding updates must be performed. The number

    of duplicate key errors are reported in the duplicate key parameter.

    It is allowed to continue to the batched update after this call, the

    handler has to wait until end_bulk_update with changing state.



      exec_bulk_update()

        dup_key_found       Number of duplicate keys found

    RETURN

      0           Success

      >0          Error code

  */

  virtual int exec_bulk_update(uint *dup_key_found)

  {

    DBUG_ASSERT(FALSE);

    return HA_ERR_WRONG_COMMAND;

  }

  /*

    SYNOPSIS

    Perform any needed clean-up, no outstanding updates are there at the

    moment.



      end_bulk_update()

    RETURN

      Nothing

  */

  virtual void end_bulk_update() { return; }

  /*

    SYNOPSIS

    Execute all outstanding deletes and close down the bulk delete.



      end_bulk_delete()

    RETURN

    0             Success

    >0            Error code

  */

  virtual int end_bulk_delete()

  {

    DBUG_ASSERT(FALSE);

sql/sql_delete.cc

+6 −6
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, 
  deleted=0L;

  init_ftfuncs(thd, select_lex, 1);

  thd->proc_info="updating";

  will_batch= table->file->start_bulk_delete();

  will_batch= !table->file->start_bulk_delete();

  while (!(error=info.read_record(&info)) && !thd->killed &&

	 !thd->net.report_error)

  {
@@ -623,7 +623,7 @@ int multi_delete::do_deletes(bool from_send_error) 
      been deleted by foreign key handling

    */

    info.ignore_not_found_rows= 1;

    will_batch= table->file->start_bulk_delete();

    will_batch= !table->file->start_bulk_delete();

    while (!(local_error=info.read_record(&info)) && !thd->killed)

    {

      if ((local_error= table->file->delete_row(table->record[0])))

sql/sql_update.cc

+15 −16
Original line number Diff line number Diff line
@@ -262,8 +262,7 @@ int mysql_update(THD *thd, 
  else

    used_key_is_modified=0;



  if ((used_key_is_modified &&

       !(table->file->table_flags() & HA_CAN_SCAN_UPDATED_INDEX)) || order)

  if (used_key_is_modified || order)

  {

    /*

      We can't update table directly;  We must first search after all
@@ -393,7 +392,7 @@ int mysql_update(THD *thd, 
                              (thd->variables.sql_mode &

                               (MODE_STRICT_TRANS_TABLES |

                                MODE_STRICT_ALL_TABLES)));

  will_batch= table->file->start_bulk_update();

  will_batch= !table->file->start_bulk_update();

  while (!(error=info.read_record(&info)) && !thd->killed)

  {

    if (!(select && select->skip_record()))