← Back to branch summary

~ubuntu-branches/ubuntu/maverick/mysql-5.1/maverick-proposed

« back to all changes in this revision

Viewing changes to storage/myisam/mi_write.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 14:16:05 UTC
  • mto: This revision was merged to the branch mainline in revision 20.
  • Revision ID: package-import@ubuntu.com-20120222141605-nxlu9yzc6attylc2
Tags: upstream-5.1.61
Import upstream version 5.1.61

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_write.c
1
 
/* Copyright (C) 2000-2006 MySQL AB
 
1
/*
 
2
   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
2
3
 
3
4
   This program is free software; you can redistribute it and/or modify
4
5
   it under the terms of the GNU General Public License as published by
11
12
 
12
13
   You should have received a copy of the GNU General Public License
13
14
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
15
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
16
*/
15
17
 
16
18
/* Write a row to a MyISAM table */
17
19
 
18
20
#include "fulltext.h"
19
21
#include "rt_index.h"
 
22
#include "my_compare.h"
20
23
 
21
24
#define MAX_POINTER_LENGTH 8
22
25
 
210
213
        else
211
214
        {
212
215
          uint key_length=_mi_make_key(info,i,buff,record,filepos);
213
 
          if (_mi_ck_delete(info,i,buff,key_length))
 
216
          if (share->keyinfo[i].ck_delete(info, i, buff, key_length))
214
217
          {
215
218
            if (local_lock_tree)
216
219
              rw_unlock(&share->key_root_lock[i]);
525
528
  {
526
529
    if (keyinfo->block_length - a_length < 32 &&
527
530
        keyinfo->flag & HA_FULLTEXT && key_pos == endpos &&
528
 
        info->s->base.key_reflength <= info->s->base.rec_reflength &&
 
531
        info->s->base.key_reflength <= info->s->rec_reflength &&
529
532
        info->s->options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD))
530
533
    {
531
534
      /*