Commit 48ca28c8 authored by paul@teton.kitebird.com's avatar paul@teton.kitebird.com
Browse files

Merge paul@work.mysql.com:/home/bk/mysql-4.0 

into teton.kitebird.com:/home/paul/mysql-4.0
parents 310b6c5f ffdff5f7

sql/ha_innodb.h

+1 −5
Original line number Diff line number Diff line
@@ -81,10 +81,6 @@ class ha_innobase: public handler 
			  HA_NO_WRITE_DELAYED |

			  HA_PRIMARY_KEY_IN_READ_INDEX |

			  HA_DROP_BEFORE_CREATE |

			  /* We should also list HA_NOT_READ_PREFIX_LAST

			     here but it currently seems to break ORDER BY;

			     until release 4.0.5 some LIKE 'abc%' ... DESC

			     queries will not work correctly */

			  HA_NO_PREFIX_CHAR_KEYS |

			  HA_TABLE_SCAN_ON_INDEX),

	  last_dup_key((uint) -1),
@@ -100,7 +96,7 @@ class ha_innobase: public handler 
	ulong index_flags(uint idx) const

	{

	  return (HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER |

		  HA_KEY_READ_ONLY);

		  HA_KEY_READ_ONLY | HA_NOT_READ_PREFIX_LAST);

	}

  	uint max_record_length() const { return HA_MAX_REC_LENGTH; }

  	uint max_keys()          const { return MAX_KEY; }