summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-02-17 11:09:33 +0100
committerSergei Golubchik <sergii@pisem.net>2014-02-17 11:09:33 +0100
commit84c96a263efc2eacfe3003ed6c997056682adf8a (patch)
treeaf0801c8bb8de8d279cf495385459db511081dcc /storage
parent4881c650070f960173f8fa2e5f905600e291bb44 (diff)
downloadmariadb-git-84c96a263efc2eacfe3003ed6c997056682adf8a.tar.gz
different fix for internal Oracle MySQL bug#16324629 that doesn't crash
(simply, copied from FederatedX)
Diffstat (limited to 'storage')
-rw-r--r--storage/federated/ha_federated.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 624445dda1a..b3db61355a4 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -2744,7 +2744,8 @@ void ha_federated::position(const uchar *record __attribute__ ((unused)))
{
DBUG_ENTER("ha_federated::position");
- DBUG_ASSERT(stored_result);
+ if (!stored_result)
+ DBUG_VOID_RETURN;
position_called= TRUE;
/* Store result set address. */