Commit ea0915dc authored by Sergei Golubchik's avatar Sergei Golubchik

federatedx: avoid unnecessary bzero. improve dbug traces

parent e840d323
...@@ -2732,7 +2732,8 @@ int ha_federatedx::read_range_next() ...@@ -2732,7 +2732,8 @@ int ha_federatedx::read_range_next()
int ha_federatedx::index_next(uchar *buf) int ha_federatedx::index_next(uchar *buf)
{ {
DBUG_ENTER("ha_federatedx::index_next"); DBUG_ENTER("ha_federatedx::index_next");
DBUG_RETURN(read_next(buf, stored_result)); int retval=read_next(buf, stored_result);
DBUG_RETURN(retval);
} }
...@@ -2887,7 +2888,8 @@ int ha_federatedx::rnd_next(uchar *buf) ...@@ -2887,7 +2888,8 @@ int ha_federatedx::rnd_next(uchar *buf)
*/ */
DBUG_RETURN(1); DBUG_RETURN(1);
} }
DBUG_RETURN(read_next(buf, stored_result)); int retval=read_next(buf, stored_result);
DBUG_RETURN(retval);
} }
...@@ -2958,10 +2960,11 @@ void ha_federatedx::position(const uchar *record __attribute__ ((unused))) ...@@ -2958,10 +2960,11 @@ void ha_federatedx::position(const uchar *record __attribute__ ((unused)))
{ {
DBUG_ENTER("ha_federatedx::position"); DBUG_ENTER("ha_federatedx::position");
bzero(ref, ref_length);
if (!stored_result) if (!stored_result)
{
bzero(ref, ref_length);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
}
if (txn->acquire(share, TRUE, &io)) if (txn->acquire(share, TRUE, &io))
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment