summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-11-16 07:45:07 -0200
committerDavi Arnaut <davi.arnaut@oracle.com>2010-11-16 07:45:07 -0200
commit2495e10c110c97960ebf313588781677d8d9c0ba (patch)
tree8bb3c24e83c5645c346086318667a4d0cdb7b6a2 /storage/myisam
parentb4b3c996af688aabb0001dbbf925084c46858fa7 (diff)
parent80246ac8b8d0d2db08feae2a643a3dc89f9022d6 (diff)
downloadmariadb-git-2495e10c110c97960ebf313588781677d8d9c0ba.tar.gz
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/ft_nlq_search.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/ft_nlq_search.c b/storage/myisam/ft_nlq_search.c
index 937bb6ffe19..a2e29d90897 100644
--- a/storage/myisam/ft_nlq_search.c
+++ b/storage/myisam/ft_nlq_search.c
@@ -63,7 +63,7 @@ static int FT_SUPERDOC_cmp(void* cmp_arg __attribute__((unused)),
static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
{
- int subkeys, r;
+ int UNINIT_VAR(subkeys), r;
uint keylen, doc_cnt;
FT_SUPERDOC sdoc, *sptr;
TREE_ELEMENT *selem;