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 /sql/protocol.cc | |
| 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 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 4f69a0fdb52..fad84f8be40 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (c) 2000, 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 @@ -525,9 +525,9 @@ void Protocol::init(THD *thd_arg) for the error. */ -void Protocol::end_partial_result_set(THD *thd) +void Protocol::end_partial_result_set(THD *thd_arg) { - net_send_eof(thd, thd->server_status, 0 /* no warnings, we're inside SP */); + net_send_eof(thd_arg, thd_arg->server_status, 0 /* no warnings, we're inside SP */); } |