Commit 4844315a authored by unknown's avatar unknown
Browse files

Merge mskold@build.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


sql/handler.cc:
  Auto merged
parents 9b1a3343 1187c2ae

sql/ha_ndbcluster.cc

+20 −5
Original line number Diff line number Diff line
@@ -1959,7 +1959,7 @@ int ha_ndbcluster::index_read(byte *buf, 
  start_key.key=    key;

  start_key.length= key_len;

  start_key.flag=   find_flag;

  DBUG_RETURN(read_range_first(&start_key, NULL, false, true));

  DBUG_RETURN(read_range_first_to_buf(&start_key, NULL, false, true, buf));

}
@@ -2013,10 +2013,25 @@ int ha_ndbcluster::read_range_first(const key_range *start_key, 
				    const key_range *end_key,

				    bool eq_range, bool sorted)

{

  KEY* key_info;

  int error= 1; 

  byte* buf= table->record[0];

  DBUG_ENTER("ha_ndbcluster::read_range_first");

  

  DBUG_RETURN(read_range_first_to_buf(start_key,

				      end_key,

				      eq_range, 

				      sorted,

				      buf));

}



inline

int ha_ndbcluster::read_range_first_to_buf(const key_range *start_key,

					   const key_range *end_key,

					   bool eq_range, bool sorted,

					   byte* buf)

{

  KEY* key_info;

  int error= 1; 

  DBUG_ENTER("ha_ndbcluster::read_range_first_to_buf");

  DBUG_PRINT("info", ("eq_range: %d, sorted: %d", eq_range, sorted));



  if (m_active_cursor)

sql/ha_ndbcluster.h

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ class ha_ndbcluster: public handler 
  int read_range_first(const key_range *start_key,

		       const key_range *end_key,

		       bool eq_range, bool sorted);

  int read_range_first_to_buf(const key_range *start_key,

			      const key_range *end_key,

			      bool eq_range, bool sorted,

			      byte* buf);

  int read_range_next();



  bool get_error_message(int error, String *buf);

sql/handler.cc

+3 −3
Original line number Diff line number Diff line
@@ -1433,9 +1433,9 @@ int handler::read_range_first(const key_range *start_key, 
		       start_key->length,

		       start_key->flag);

  if (result)

    DBUG_RETURN((result == HA_ERR_KEY_NOT_FOUND ||

		 result == HA_ERR_END_OF_FILE) ? HA_ERR_END_OF_FILE :

		result);

    DBUG_RETURN((result == HA_ERR_KEY_NOT_FOUND) 

		? HA_ERR_END_OF_FILE

		: result);



  DBUG_RETURN (compare_key(end_range) <= 0 ? 0 : HA_ERR_END_OF_FILE);

}