merged

configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

1 files changed, 9 insertions, 26 deletions

diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index 4ad7633f9c3..cf026def5ca 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -61,20 +61,11 @@ class ha_innobase: public handler
 	ulong		start_of_scan;	/* this is set to 1 when we are
 					starting a table scan but have not
 					yet fetched any row, else 0 */
-	uint		active_index_before_scan;
-					/* since a table scan in InnoDB is
-					always done through an index, a table
-					scan may change active_index; but
-					MySQL may assume that active_index
-					after a table scan is the same as
-					before; we store the value here so
-					that we can restore the value after
-					a scan */
 	uint		last_match_mode;/* match mode of the latest search:
 					ROW_SEL_EXACT, ROW_SEL_EXACT_PREFIX,
 					or undefined */
 	longlong	auto_inc_counter_for_this_stat;
-	ulong max_row_length(const byte *buf);
+	ulong max_supported_row_length(const byte *buf);
 
 	uint store_key_val_for_row(uint keynr, char* buff, uint buff_len,
 					       const byte* record);
@@ -87,13 +78,10 @@ class ha_innobase: public handler
  public:
   	ha_innobase(TABLE *table): handler(table),
 	  int_table_flags(HA_REC_NOT_IN_SEQ |
-			  HA_KEYPOS_TO_RNDPOS |
-			  HA_LASTKEY_ORDER |
-			  HA_NULL_KEY | HA_FAST_KEY_READ |
-			  HA_BLOB_KEY |
+			  HA_NULL_IN_KEY | HA_FAST_KEY_READ |
+			  HA_CAN_INDEX_BLOBS |
 			  HA_CAN_SQL_HANDLER |
 			  HA_NOT_EXACT_COUNT |
-			  HA_NO_WRITE_DELAYED |
 			  HA_PRIMARY_KEY_IN_READ_INDEX |
 			  HA_TABLE_SCAN_ON_INDEX),
 	  last_dup_key((uint) -1),
@@ -106,14 +94,12 @@ class ha_innobase: public handler
 	const char *index_type(uint key_number) { return "BTREE"; }
   	const char** bas_ext() const;
  	ulong table_flags() const { return int_table_flags; }
-	ulong index_flags(uint idx) const
+	ulong index_flags(uint idx, uint part) const
 	{
-	  return (HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER |
-		  HA_KEY_READ_ONLY);
+	  return (HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER | HA_READ_RANGE |
+                  HA_KEYREAD_ONLY);
 	}
-  	uint max_record_length() const { return HA_MAX_REC_LENGTH; }
-  	uint max_keys()          const { return MAX_KEY; }
-  	uint max_key_parts()     const { return MAX_REF_PARTS; }
+  	uint max_supported_keys()          const { return MAX_KEY; }
 				/* An InnoDB page must store >= 2 keys;
 				a secondary key record must also contain the
 				primary key value:
@@ -121,15 +107,12 @@ class ha_innobase: public handler
 				less than 1 / 4 of page size which is 16 kB;
 				but currently MySQL does not work with keys
 				whose size is > MAX_KEY_LENGTH */
-  	uint max_key_length() const { return((MAX_KEY_LENGTH <= 3500) ?
-					  MAX_KEY_LENGTH : 3500);}
-  	uint max_key_part_length() { return((MAX_KEY_LENGTH <= 3500) ?
-					  MAX_KEY_LENGTH : 3500);}
+  	uint max_supported_key_length() const { return 3500; }
+  	uint max_supported_key_part_length() const { return 3500; }
 	const key_map *keys_to_use_for_scanning() { return &key_map_full; }
   	bool has_transactions()  { return 1;}
 
   	int open(const char *name, int mode, uint test_if_locked);
-  	void initialize(void);
   	int close(void);
   	double scan_time();
 	double read_time(uint index, uint ranges, ha_rows rows);