diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-09-25 19:02:46 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-09-25 19:02:46 +0300 |
| commit | 3cb32b8c137e3a3cdf9a0d4d6bde506d33edb7ab (patch) | |
| tree | 9d446f53806872fb52ac403ea7d726fbe38858c1 | |
| parent | 17109c8b187fc15ecf94f44a03c4d794cf76b9e5 (diff) | |
| download | mariadb-git-3cb32b8c137e3a3cdf9a0d4d6bde506d33edb7ab.tar.gz | |
ha_innodb.cc, ha_innodb.h:
Move to the right place the flag which bans use of HA_READ_PREFIX_LAST; add diagnostics and remove the assertion on line 2180 of ha_innodb.cc
sql/ha_innodb.h:
Move to the right place the flag which bans use of HA_READ_PREFIX_LAST; add diagnostics and remove the assertion on line 2180 of ha_innodb.cc
sql/ha_innodb.cc:
Move to the right place the flag which bans use of HA_READ_PREFIX_LAST; add diagnostics and remove the assertion on line 2180 of ha_innodb.cc
| -rw-r--r-- | sql/ha_innodb.cc | 7 | ||||
| -rw-r--r-- | sql/ha_innodb.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index c9449ff5384..c622a92f797 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2179,7 +2179,12 @@ convert_search_mode_to_innobase( case HA_READ_AFTER_KEY: return(PAGE_CUR_G); case HA_READ_BEFORE_KEY: return(PAGE_CUR_L); case HA_READ_PREFIX: return(PAGE_CUR_GE); - case HA_READ_PREFIX_LAST: ut_a(0); return(PAGE_CUR_LE); + case HA_READ_PREFIX_LAST: + ut_print_timestamp(stderr); + fprintf(stderr, + " InnoDB: Warning: Using HA_READ_PREFIX_LAST\n"); + return(PAGE_CUR_LE); + /* InnoDB does not yet support ..PREFIX_LAST! We have to add a new search flag PAGE_CUR_LE_OR_PREFIX to InnoDB. */ diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index 357fb31b5e3..84cf6343bda 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -82,6 +82,7 @@ class ha_innobase: public handler HA_PRIMARY_KEY_IN_READ_INDEX | HA_DROP_BEFORE_CREATE | HA_NO_PREFIX_CHAR_KEYS | + HA_NOT_READ_PREFIX_LAST | HA_TABLE_SCAN_ON_INDEX), last_dup_key((uint) -1), start_of_scan(0) @@ -96,7 +97,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_NOT_READ_PREFIX_LAST); + HA_KEY_READ_ONLY); } uint max_record_length() const { return HA_MAX_REC_LENGTH; } uint max_keys() const { return MAX_KEY; } |