diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-13 13:42:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-13 13:42:38 +0400 |
| commit | c69629d269fcab948800a427eff587b68cd7cf34 (patch) | |
| tree | e56ffd06670e5f719dc7c91ca477eb50aa578a24 /sql/handler.cc | |
| parent | eddd727a3a3de0e27e921551263e18c0b558a8ca (diff) | |
| parent | 85bb4aa09ee906c5cb8a3f7af8ff319e3a6c93b9 (diff) | |
| download | mariadb-git-c69629d269fcab948800a427eff587b68cd7cf34.tar.gz | |
Merge from mysql-5.1.
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 24ada69ff87..1afc21520f7 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3502,14 +3502,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'. |