diff options
| author | unknown <monty@donna.mysql.com> | 2000-08-29 19:38:32 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-08-29 19:38:32 +0300 |
| commit | 463016ee2740fa00e56039bc0b1f8122019c982a (patch) | |
| tree | 11ed770fa863e0b50af0b27d2c231817f7655ef8 /myisammrg/myrg_rnext.c | |
| parent | 3776743da299b4229fe12a36cd6a6c0f6fb6b1e6 (diff) | |
| download | mariadb-git-463016ee2740fa00e56039bc0b1f8122019c982a.tar.gz | |
Updates for release
BitKeeper/deleted/.del-mi_debug.c:
***MISSING WEAVE***
BUILD/compile-alpha-ccc:
Added thread safe libraries
Docs/manual.texi:
Added information about --log-slow-queries
Makefile.am:
Fix for thread safe libraries
client/mysql.cc:
Allow commands without ; on first line
myisam/Makefile.am:
Removed mi_debug.c
myisam/mi_check.c:
Removed compiler warnings
myisam/mi_dbug.c:
Extra debugging
myisammrg/myrg_rkey.c:
Removed compiler warnings
myisammrg/myrg_rnext.c:
Removed compiler warnings
myisammrg/myrg_rprev.c:
Removed compiler warnings
sql/mini_client.cc:
Removed compiler warnings
sql/mysqld.cc:
Updated help
sql/sql_parse.cc:
Fix permission checking for RENAME
tests/grant.pl:
Added more grant tests
tests/grant.res:
New results
Diffstat (limited to 'myisammrg/myrg_rnext.c')
| -rw-r--r-- | myisammrg/myrg_rnext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisammrg/myrg_rnext.c b/myisammrg/myrg_rnext.c index 2bfa59be3ef..e714ce3b139 100644 --- a/myisammrg/myrg_rnext.c +++ b/myisammrg/myrg_rnext.c @@ -24,7 +24,7 @@ int myrg_rnext(MYRG_INFO *info, byte *buf, int inx) { MYRG_TABLE *table; MI_INFO *mi; - uchar *key_buff; + byte *key_buff; uint pack_key_length; int err; @@ -50,7 +50,7 @@ int myrg_rnext(MYRG_INFO *info, byte *buf, int inx) if (table < info->end_table) { mi=info->last_used_table->table; - key_buff=mi->lastkey+mi->s->base.max_key_length; + key_buff=(byte*) mi->lastkey+mi->s->base.max_key_length; pack_key_length=mi->last_rkey_length; for (; table < info->end_table ; table++) { |