diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-10-04 20:33:42 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-10-04 20:33:42 +0300 |
| commit | 4eb383e06c021e89244cbf7d24abecb7b3bde01b (patch) | |
| tree | 6574ddabcd49b313915d7d025c74aaf9b04bec33 /storage/maria/ma_update.c | |
| parent | 6f296a01ac39f7d10774fd3d93b5633f31ce99c7 (diff) | |
| download | mariadb-git-4eb383e06c021e89244cbf7d24abecb7b3bde01b.tar.gz | |
After merge fixes. Applied changes made in myisam manually to maria.
storage/maria/ma_test1.c:
After merge fixes. Applied changes made in myisam manually to maria.
Fixed memory leak.
storage/maria/ma_test2.c:
After merge fixes. Applied changes made in myisam manually to maria.
Fixed memory leak.
Diffstat (limited to 'storage/maria/ma_update.c')
| -rw-r--r-- | storage/maria/ma_update.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/maria/ma_update.c b/storage/maria/ma_update.c index 0cb2e2b648b..759f94e6450 100644 --- a/storage/maria/ma_update.c +++ b/storage/maria/ma_update.c @@ -110,7 +110,7 @@ int maria_update(register MARIA_HA *info, const uchar *oldrec, uchar *newrec) key_changed|=HA_STATE_WRITTEN; } changed|=((ulonglong) 1 << i); - if (_ma_ft_update(info,i,(char*) old_key,oldrec,newrec,pos)) + if (_ma_ft_update(info,i,old_key,oldrec,newrec,pos)) goto err; } } @@ -215,8 +215,8 @@ err: { if (share->keyinfo[i].flag & HA_FULLTEXT) { - if ((flag++ && _ma_ft_del(info,i,(char*) new_key,newrec,pos)) || - _ma_ft_add(info,i,(char*) old_key,oldrec,pos)) + if ((flag++ && _ma_ft_del(info,i,new_key,newrec,pos)) || + _ma_ft_add(info,i,old_key,oldrec,pos)) break; } else |