diff options
| author | unknown <stewart@mysql.com> | 2005-12-28 00:57:18 +1100 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-12-28 00:57:18 +1100 |
| commit | 88ef95ff4ea9e52b547f1c7bb46a1cdff79a9d80 (patch) | |
| tree | 7b1f7fc6b293f1282548cf6fffc5136e62859182 /myisam | |
| parent | 6759bbce9ac1a01f5f218d777a5a6e4fb0ceab0d (diff) | |
| parent | c2ac089167ac158aff1318cdb94c55a48fae34a5 (diff) | |
| download | mariadb-git-88ef95ff4ea9e52b547f1c7bb46a1cdff79a9d80.tar.gz | |
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
client/mysql.cc:
Auto merged
myisam/mi_delete.c:
Auto merged
mysql-test/r/fulltext2.result:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_delete.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index bf99830b37f..416d951d138 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -170,7 +170,7 @@ static int _mi_ck_real_delete(register MI_INFO *info, MI_KEYDEF *keyinfo, goto err; } if ((error=d_search(info,keyinfo, - (keyinfo->flag & HA_FULLTEXT ? SEARCH_FIND + (keyinfo->flag & HA_FULLTEXT ? SEARCH_FIND | SEARCH_UPDATE : SEARCH_SAME), key,key_length,old_root,root_buff)) >0) { |