summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-04-08 12:52:53 +0300
committerMichael Widenius <monty@askmonty.org>2010-04-08 12:52:53 +0300
commitdb1d83a5cca4c1b9d96b8580ae2bde80a31f1ad8 (patch)
treef227c794a048f6e49813e5564f749f4467d6333f /sql/handler.cc
parenta91e89dec672cd954d20fbe729006f2845bd32ed (diff)
parent04ff96f7891cf4a714a3f60a4ec15b5ead7a3f31 (diff)
downloadmariadb-git-db1d83a5cca4c1b9d96b8580ae2bde80a31f1ad8.tar.gz
Merge with 5.1
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 28d898e1614..9c2c3e3f1fb 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4450,6 +4450,8 @@ int handler::index_read_idx_map(uchar * buf, uint index, const uchar * key,
enum ha_rkey_function find_flag)
{
int error, error1;
+ LINT_INIT(error1);
+
error= index_init(index, 0);
if (!error)
{