diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2010-03-14 17:01:45 +0100 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2010-03-14 17:01:45 +0100 |
| commit | 3f4d8edb84a2980f636d27b40244edfa98cbdfe4 (patch) | |
| tree | 58c6509541b2a20be10d2701ee31d4394c45ad8a /storage/federated | |
| parent | 0e9451186d8812d405d5659f943427bb2beb57e5 (diff) | |
| download | mariadb-git-3f4d8edb84a2980f636d27b40244edfa98cbdfe4.tar.gz | |
Bug #49829 Many "hides virtual function" warnings with
SunStudio
SunStudio compilers of late warn about methods that might hide
methods in base classes due to the use of overloading combined
with overriding. SunStudio also warns about variables defined
in local socpe or method arguments that have the same name as
a member attribute of the class.
This patch renames methods that might hide base class methods,
to make it easier both for humans and compilers to see what is
actually called. It also renames variables in local scope.
Diffstat (limited to 'storage/federated')
| -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 f8dde34b82b..955c35ad71b 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 @@ -1253,7 +1253,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; @@ -1360,7 +1360,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; @@ -3208,14 +3208,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) { |