summaryrefslogtreecommitdiff
path: root/sql/ha_federated.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/ha_federated.cc')
-rw-r--r--sql/ha_federated.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index 9abfcdc61c6..09f7ecb0296 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -1097,7 +1097,7 @@ bool ha_federated::create_where_from_key(String *to,
KEY *key_info,
const key_range *start_key,
const key_range *end_key,
- bool records_in_range)
+ bool from_records_in_range)
{
bool both_not_null=
(start_key != NULL && end_key != NULL) ? TRUE : FALSE;
@@ -1165,7 +1165,7 @@ bool ha_federated::create_where_from_key(String *to,
if (emit_key_part_name(&tmp, key_part))
DBUG_RETURN(1);
- if (records_in_range)
+ if (from_records_in_range)
{
if (tmp.append(FEDERATED_GE))
DBUG_RETURN(1);
@@ -1384,7 +1384,7 @@ static int free_share(FEDERATED_SHARE *share)
ha_rows ha_federated::records_in_range(uint inx, key_range *start_key,
- key_range *end_key)
+ key_range *end_key)
{
/*
@@ -2062,7 +2062,7 @@ int ha_federated::index_init(uint keynr)
int ha_federated::read_range_first(const key_range *start_key,
const key_range *end_key,
- bool eq_range, bool sorted)
+ bool eq_range_arg, bool sorted)
{
char sql_query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
int retval;