diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-20 23:23:42 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-20 23:23:42 +0300 |
| commit | acc2b9e3662cd868f5108b1b4ee7257d95582f02 (patch) | |
| tree | 772f4ae43ad7ce905f024b77bebdd1897d813391 /storage/federated/ha_federated.cc | |
| parent | 41f23283e54d311155959faf58ae7edf81803ca3 (diff) | |
| parent | 84917914e01415cbbc2a128cabc344c127e76db1 (diff) | |
| download | mariadb-git-acc2b9e3662cd868f5108b1b4ee7257d95582f02.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/partition_innodb.result
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/item_sum.h
Text conflict in sql/log_event_old.cc
Text conflict in sql/protocol.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_yacc.yy
Diffstat (limited to 'storage/federated/ha_federated.cc')
| -rw-r--r-- | storage/federated/ha_federated.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 80b620db639..99ea762fb32 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 MySQL AB +/* Copyright (c) 2004, 2010 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1254,7 +1254,7 @@ bool ha_federated::create_where_from_key(String *to, const key_range *start_key, const key_range *end_key, bool from_records_in_range, - bool eq_range) + bool eq_range_arg) { bool both_not_null= (start_key != NULL && end_key != NULL) ? TRUE : FALSE; @@ -1361,7 +1361,7 @@ bool ha_federated::create_where_from_key(String *to, } break; case HA_READ_AFTER_KEY: - if (eq_range) + if (eq_range_arg) { if (tmp.append("1=1")) // Dummy goto err; @@ -3241,14 +3241,14 @@ bool ha_federated::get_error_message(int error, String* buf) @details Call @c mysql_store_result() to save a result set then append it to the stored results array. - @param[in] mysql MySLQ connection structure. + @param[in] mysql_arg MySLQ connection structure. @return Stored result set (MYSQL_RES object). */ -MYSQL_RES *ha_federated::store_result(MYSQL *mysql) +MYSQL_RES *ha_federated::store_result(MYSQL *mysql_arg) { - MYSQL_RES *result= mysql_store_result(mysql); + MYSQL_RES *result= mysql_store_result(mysql_arg); DBUG_ENTER("ha_federated::store_result"); if (result) { |