summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-17 17:42:28 +0100
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-17 17:42:28 +0100
commitb5ec36073121454ed5924ce701588c0432a2e886 (patch)
tree762cc277bfc28d7e965b69131fc67ef23d9775d8 /sql/handler.cc
parent1e9f239e8f191b3060fa1a7aee0b1448af20316e (diff)
parent36ab257491c3021680c4d845c4690e3e294c2436 (diff)
downloadmariadb-git-b5ec36073121454ed5924ce701588c0432a2e886.tar.gz
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 22bb3069a9f..38b57c16ee0 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4184,7 +4184,7 @@ int handler::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
*/
int handler::read_multi_range_next(KEY_MULTI_RANGE **found_range_p)
{
- int result;
+ int UNINIT_VAR(result);
DBUG_ENTER("handler::read_multi_range_next");
/* We should not be called after the last call returned EOF. */