diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-29 20:40:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-29 20:40:03 +0200 |
| commit | 3794110f0215f0631107c2694dc0f1675a4bb520 (patch) | |
| tree | 3400a806088335fffbb0c567d5ee7f40ca9a90ce /storage/maria/ma_search.c | |
| parent | 949027f7c7b8704f2a329c85b8725af5158f3ade (diff) | |
| download | mariadb-git-3794110f0215f0631107c2694dc0f1675a4bb520.tar.gz | |
fix the build and compiler warnings (few of which were real bugs)
for "cmake ." builds
Diffstat (limited to 'storage/maria/ma_search.c')
| -rw-r--r-- | storage/maria/ma_search.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c index 5dd0296e17b..8bd24524f67 100644 --- a/storage/maria/ma_search.c +++ b/storage/maria/ma_search.c @@ -356,8 +356,8 @@ int _ma_seq_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, uint32 comp_flag, uchar **ret_pos, uchar *buff, my_bool *last_key) { - int flag; - uint page_flag, nod_flag, length, not_used[2]; + int UNINIT_VAR(flag); + uint page_flag, nod_flag, UNINIT_VAR(length), not_used[2]; uchar t_buff[MARIA_MAX_KEY_BUFF], *end; uchar *page; MARIA_KEYDEF *keyinfo= key->keyinfo; @@ -365,9 +365,6 @@ int _ma_seq_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, MARIA_KEY tmp_key; DBUG_ENTER("_ma_seq_search"); - LINT_INIT(flag); - LINT_INIT(length); - page_flag= ma_page->flag; nod_flag= ma_page->node; page= ma_page->buff; @@ -430,10 +427,10 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, uint nod_flag, length, len, matched, cmplen, kseg_len; uint page_flag, prefix_len,suffix_len; int key_len_skip, seg_len_pack, key_len_left; - uchar *end, *vseg, *saved_vseg, *saved_from; + uchar *end, *vseg, *UNINIT_VAR(saved_vseg), *UNINIT_VAR(saved_from); uchar *page; uchar tt_buff[MARIA_MAX_KEY_BUFF+2], *t_buff=tt_buff+2; - uchar *saved_to; + uchar *UNINIT_VAR(saved_to); const uchar *kseg; uint saved_length=0, saved_prefix_len=0; uint length_pack; @@ -442,13 +439,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, const uchar *sort_order= keyinfo->seg->charset->sort_order; DBUG_ENTER("_ma_prefix_search"); - LINT_INIT(length); - LINT_INIT(prefix_len); - LINT_INIT(seg_len_pack); - LINT_INIT(saved_from); - LINT_INIT(saved_to); - LINT_INIT(saved_vseg); - t_buff[0]=0; /* Avoid bugs */ page_flag= ma_page->flag; nod_flag= ma_page->node; |