diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-01 13:45:48 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-01 13:45:48 +0300 |
| commit | 1776fbac85f35241d4c4726e40f9e40d8267e115 (patch) | |
| tree | b31bc7d8e38b04c6603c8f2240f10f86497e5003 /myisammrg | |
| parent | 05f08c18ac1de3b5b23aab88e87387d2031b3c9b (diff) | |
| download | mariadb-git-1776fbac85f35241d4c4726e40f9e40d8267e115.tar.gz | |
Fixed bug in ALTER TABLE
Removed _mi_rkey() function
New fork_big.pl multi-thread test
BitKeeper/deleted/.del-fork3_test.pl~c4a7bffb4f8e813c:
Delete: tests/fork3_test.pl
BitKeeper/deleted/.del-fork_test.pl~3d3535329ed8cd5e:
Delete: tests/fork_test.pl
Docs/manual.texi:
Changelog.
Updated support information
client/mysqladmin.c:
Removed not used --timeout option
configure.in:
Update version
myisam/mi_extra.c:
Fixed bug in ALTER TABLE
myisam/mi_rkey.c:
Removed _mi_rkey() function
myisam/myisamdef.h:
Removed _mi_rkey() function
myisammrg/myrg_rkey.c:
Removed _mi_rkey() function
myisammrg/myrg_rnext.c:
Removed _mi_rkey() function
mysql-test/t/alter_table.test:
Added test case for ALTER TABLE bug
sql/derror.cc:
Moved shutdown message to clean_up
sql/mysql_priv.h:
Moved shutdown message to clean_up
sql/sql_class.cc:
Fixed bug in MySQL compiled with transactions but using --skip-"table-handler"
sql/sql_show.cc:
Use time_after_lock for time of query when debugging
sql/sql_test.cc:
Check memory overruns when using 'mysqladmin debug'
strings/ctype-tis620.c:
F
Diffstat (limited to 'myisammrg')
| -rw-r--r-- | myisammrg/myrg_rkey.c | 4 | ||||
| -rw-r--r-- | myisammrg/myrg_rnext.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/myisammrg/myrg_rkey.c b/myisammrg/myrg_rkey.c index c907701d50d..6560380622a 100644 --- a/myisammrg/myrg_rkey.c +++ b/myisammrg/myrg_rkey.c @@ -63,7 +63,9 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, } else { - err=_mi_rkey(mi,buf,inx,key_buff,pack_key_length,search_flag,FALSE); + mi->use_packed_key=1; + err=mi_rkey(mi,buf,inx,key_buff,pack_key_length,search_flag); + mi->use_packed_key=0; } info->last_used_table=table+1; diff --git a/myisammrg/myrg_rnext.c b/myisammrg/myrg_rnext.c index 104a94a6f91..d5bc9c54339 100644 --- a/myisammrg/myrg_rnext.c +++ b/myisammrg/myrg_rnext.c @@ -68,8 +68,10 @@ int _myrg_finish_scan(MYRG_INFO *info, int inx, enum ha_rkey_function type) for (; table < info->end_table ; table++) { mi=table->table; - if ((err=_mi_rkey(mi,NULL,inx,key_buff,pack_key_length, - type,FALSE))) + mi->use_packed_key=1; + err=mi_rkey(mi,NULL,inx,key_buff,pack_key_length,type); + mi->use_packed_key=0; + if (err) { if (err == HA_ERR_KEY_NOT_FOUND) /* If end of file */ continue; |