summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-12-13 16:42:32 +0200
committermonty@mashka.mysql.fi <>2002-12-13 16:42:32 +0200
commitb4d508b43381774b24348b076a62f05ae272492e (patch)
treee0dee708104352cafd3df2d4a5e33d0030922d7c /sql
parenta716ca2c455f447f2e33df1ab9fcdd8eda487091 (diff)
parent7602b3a1f06c213700c341ebd574b2129ccb4607 (diff)
downloadmariadb-git-b4d508b43381774b24348b076a62f05ae272492e.tar.gz
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_myisammrg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h
index 8e33b99e418..440b51e660f 100644
--- a/sql/ha_myisammrg.h
+++ b/sql/ha_myisammrg.h
@@ -69,7 +69,7 @@ class ha_myisammrg: public handler
int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos);
void position(const byte *record);
- ha_rows ha_myisammrg::records_in_range(int inx,
+ 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,