Commit fb936d2a authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.1-release 

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
parents 8ead0fe6 558c41ab

sql/log_event.cc

+0 −10
Original line number Diff line number Diff line
@@ -6685,16 +6685,6 @@ int Update_rows_log_event::do_before_row_operations(TABLE *table) 
{

  DBUG_ASSERT(m_memory == NULL);



  if ((table->file->table_flags() & HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS) &&

      table->s->primary_key < MAX_KEY)

  {

    /*

      We don't need to allocate any memory for m_after_image and

      m_key since they are not used.

    */

    return 0;

  }



  int error= 0;



  if (table->s->keys > 0)