Commit ee7518b5 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/item_subselect.cc:
  Auto merged
parents 7b1f818d d7395d61

sql/item_subselect.cc

+4 −2
Original line number Diff line number Diff line
@@ -1284,7 +1284,8 @@ int subselect_uniquesubquery_engine::exec() 
  error= table->file->index_read(table->record[0],

                                 tab->ref.key_buff,

                                 tab->ref.key_length,HA_READ_KEY_EXACT);

  if (error && error != HA_ERR_KEY_NOT_FOUND)

  if (error &&

      error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)

    error= report_error(table, error);

  else

  {
@@ -1336,7 +1337,8 @@ int subselect_indexsubquery_engine::exec() 
  error= table->file->index_read(table->record[0],

                                 tab->ref.key_buff,

                                 tab->ref.key_length,HA_READ_KEY_EXACT);

  if (error && error != HA_ERR_KEY_NOT_FOUND)

  if (error &&

      error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)

    error= report_error(table, error);

  else

  {