mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
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
This commit is contained in:
parent
05f08c18ac
commit
1776fbac85
18 changed files with 775 additions and 676 deletions
|
|
@ -22,8 +22,8 @@
|
|||
/* Read a record using key */
|
||||
/* Ordinary search_flag is 0 ; Give error if no record with key */
|
||||
|
||||
int _mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
|
||||
enum ha_rkey_function search_flag, bool raw_key)
|
||||
int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
|
||||
enum ha_rkey_function search_flag)
|
||||
{
|
||||
uchar *key_buff;
|
||||
MYISAM_SHARE *share=info->s;
|
||||
|
|
@ -37,7 +37,7 @@ int _mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
|
|||
|
||||
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
|
||||
|
||||
if (raw_key)
|
||||
if (!info->use_packed_key)
|
||||
{
|
||||
if (key_len == 0)
|
||||
key_len=USE_WHOLE_KEY;
|
||||
|
|
@ -101,11 +101,3 @@ int _mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
|
|||
err:
|
||||
DBUG_RETURN(my_errno);
|
||||
} /* _mi_rkey */
|
||||
|
||||
/* shouldn't forget to do it inline sometime */
|
||||
int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
|
||||
enum ha_rkey_function search_flag)
|
||||
{
|
||||
return _mi_rkey(info,buf,inx,key,key_len,search_flag,TRUE);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue