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

« back to all changes in this revision

Viewing changes to storage/myisam/ft_nlq_search.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:
1
 
/* Copyright (C) 2001-2005 MySQL AB
 
1
/*
 
2
   Copyright (c) 2001, 2010, 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
/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
17
19
 
63
65
 
64
66
static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
65
67
{
66
 
  int          subkeys, r;
 
68
  int          UNINIT_VAR(subkeys), r;
67
69
  uint         keylen, doc_cnt;
68
70
  FT_SUPERDOC  sdoc, *sptr;
69
71
  TREE_ELEMENT *selem;
72
74
  uchar        *keybuff=aio->keybuff;
73
75
  MI_KEYDEF    *keyinfo=info->s->keyinfo+aio->keynr;
74
76
  my_off_t     key_root=info->s->state.key_root[aio->keynr];
75
 
  uint         extra=HA_FT_WLEN+info->s->base.rec_reflength;
 
77
  uint         extra= HA_FT_WLEN + info->s->rec_reflength;
76
78
#if HA_FT_WTYPE == HA_KEYTYPE_FLOAT
77
79
  float tmp_weight;
78
80
#else