diff options
| author | unknown <monty@mishka.local> | 2004-05-16 14:49:32 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-05-16 14:49:32 +0300 |
| commit | 8ef62cc1ef3e2b16795fa5fbbc45bcdf422f344c (patch) | |
| tree | 0f57d538c1b4bb04893ef169be6dc7ab73ee1c67 /sql/ha_innodb.h | |
| parent | 36bce251128b8fd300c4a6329d0c2d8f601a14bc (diff) | |
| parent | 70f79563d9fa8ef3cdfef01b8eee95ea6e927147 (diff) | |
| download | mariadb-git-8ef62cc1ef3e2b16795fa5fbbc45bcdf422f344c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index 83a3edc4126..c585fd9c463 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -166,11 +166,7 @@ class ha_innobase: public handler int start_stmt(THD *thd); void position(byte *record); - ha_rows records_in_range(int inx, - const byte *start_key,uint start_key_len, - enum ha_rkey_function start_search_flag, - const byte *end_key,uint end_key_len, - enum ha_rkey_function end_search_flag); + ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key); ha_rows estimate_number_of_rows(); int create(const char *name, register TABLE *form, |