diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-16 07:45:07 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-16 07:45:07 -0200 |
| commit | 2495e10c110c97960ebf313588781677d8d9c0ba (patch) | |
| tree | 8bb3c24e83c5645c346086318667a4d0cdb7b6a2 /storage | |
| parent | b4b3c996af688aabb0001dbbf925084c46858fa7 (diff) | |
| parent | 80246ac8b8d0d2db08feae2a643a3dc89f9022d6 (diff) | |
| download | mariadb-git-2495e10c110c97960ebf313588781677d8d9c0ba.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/ft_nlq_search.c | 2 | ||||
| -rw-r--r-- | storage/myisammrg/myrg_open.c | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/storage/myisammrg/myrg_open.c b/storage/myisammrg/myrg_open.c index b8e86b89181..c545aff912f 100644 --- a/storage/myisammrg/myrg_open.c +++ b/storage/myisammrg/myrg_open.c @@ -220,7 +220,7 @@ MYRG_INFO *myrg_parent_open(const char *parent_name, int (*callback)(void*, const char*), void *callback_param) { - MYRG_INFO *m_info; + MYRG_INFO *UNINIT_VAR(m_info); int rc; int errpos; int save_errno; |