summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-01-27 15:56:00 +0100
committerunknown <knielsen@knielsen-hq.org>2011-01-27 15:56:00 +0100
commit2b5a9147c84ab3bedc4ea2bfe3a2fc83808e9047 (patch)
treefc3a995e70cfa22aadec16f40238856073b20cb9 /sql/log.cc
parent6dbd796074a2b55410aaad3fd24192b628b990ac (diff)
parentfea75f404aa9231d441cf2e2a99539630ec9f0dc (diff)
downloadmariadb-git-2b5a9147c84ab3bedc4ea2bfe3a2fc83808e9047.tar.gz
automerge
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index af91895e318..8a9ed1906c7 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -6659,8 +6659,8 @@ mysql_bin_log_commit_pos(THD *thd, ulonglong *out_pos, const char **out_file)
}
else
{
- *out_pos= NULL;
*out_file= NULL;
+ *out_pos= 0;
}
}
#endif /* INNODB_COMPATIBILITY_HOOKS */