diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
| commit | c30d924dd5485f24818264d8e533820bcf1bcba0 (patch) | |
| tree | 1b3260f72106f50b182546dff41127a389144fa1 /sql/handler.cc | |
| parent | 829525756e7a769b0c0de716f6207f5f21daa994 (diff) | |
| parent | 310833ff2e6a3c1e3ef397e78605661eee430198 (diff) | |
| download | mariadb-git-c30d924dd5485f24818264d8e533820bcf1bcba0.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 6aa6450cbb8..138bdcff1a0 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3510,14 +3510,10 @@ int handler::index_next_same(uchar *buf, const uchar *key, uint keylen) if (!(error=index_next(buf))) { my_ptrdiff_t ptrdiff= buf - table->record[0]; - uchar *save_record_0; - KEY *key_info; - KEY_PART_INFO *key_part; - KEY_PART_INFO *key_part_end; - LINT_INIT(save_record_0); - LINT_INIT(key_info); - LINT_INIT(key_part); - LINT_INIT(key_part_end); + uchar *UNINIT_VAR(save_record_0); + KEY *UNINIT_VAR(key_info); + KEY_PART_INFO *UNINIT_VAR(key_part); + KEY_PART_INFO *UNINIT_VAR(key_part_end); /* key_cmp_if_same() compares table->record[0] against 'key'. |