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 | 848445418a4881d5f7cd47da7a5d6a415cd72a89 (patch) | |
tree | 11ed770fa863e0b50af0b27d2c231817f7655ef8 /myisammrg | |
parent | f98f62b3b35ae0ff1416f1ed24ccd0ffa89d4122 (diff) | |
download | mariadb-git-848445418a4881d5f7cd47da7a5d6a415cd72a89.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')
-rw-r--r-- | myisammrg/myrg_rkey.c | 4 | ||||
-rw-r--r-- | myisammrg/myrg_rnext.c | 4 | ||||
-rw-r--r-- | myisammrg/myrg_rprev.c | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/myisammrg/myrg_rkey.c b/myisammrg/myrg_rkey.c index 2f4cfb60068..c0123588a06 100644 --- a/myisammrg/myrg_rkey.c +++ b/myisammrg/myrg_rkey.c @@ -28,7 +28,7 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, uint key_len, enum ha_rkey_function search_flag) { - uchar *key_buff; + byte *key_buff; uint pack_key_length; MYRG_TABLE *table; MI_INFO *mi; @@ -45,7 +45,7 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, if (table == info->open_tables) { err=mi_rkey(mi,buf,inx,key,key_len,search_flag); - 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; } else 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++) { diff --git a/myisammrg/myrg_rprev.c b/myisammrg/myrg_rprev.c index 3ee0894b42c..0523dc7f4e7 100644 --- a/myisammrg/myrg_rprev.c +++ b/myisammrg/myrg_rprev.c @@ -24,7 +24,7 @@ int myrg_rprev(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,12 +50,13 @@ int myrg_rprev(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++) { mi=table->table; - err=_mi_rkey(mi,NULL,inx,key_buff,pack_key_length,HA_READ_KEY_OR_PREV,FALSE); + err=_mi_rkey(mi,NULL,inx,key_buff,pack_key_length, + HA_READ_KEY_OR_PREV,FALSE); info->last_used_table=table; if (err == HA_ERR_KEY_NOT_FOUND) |