mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
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.
sql/field.cc:
Local scope variable or method argument same as class
attribute.
sql/item_cmpfunc.cc:
Local scope variable or method argument same as class
attribute.
sql/item_create.cc:
Renaming base class create() to create_func().
sql/item_create.h:
Renaming base class create() to create_func().
sql/protocol.cc:
Local scope variable or method argument same as class
attribute.
sql/sql_profile.cc:
Local scope variable or method argument same as class
attribute.
sql/sql_select.cc:
Local scope variable or method argument same as class
attribute.
sql/sql_yacc.yy:
Renaming base class create() to create_func().
storage/federated/ha_federated.cc:
Local scope variable or method argument same as class
attribute.
storage/myisammrg/ha_myisammrg.cc:
Local scope variable or method argument same as class
attribute.
This commit is contained in:
parent
57a96c77db
commit
c7fad393fd
16 changed files with 128 additions and 127 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 2000-2006 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
|
||||
|
|
@ -427,24 +427,24 @@ static MI_INFO *myisammrg_attach_children_callback(void *callback_param)
|
|||
@detail This function initializes the MERGE storage engine structures
|
||||
and adds a child list of TABLE_LIST to the parent TABLE.
|
||||
|
||||
@param[in] name MERGE table path name
|
||||
@param[in] mode read/write mode, unused
|
||||
@param[in] test_if_locked open flags
|
||||
@param[in] name MERGE table path name
|
||||
@param[in] mode read/write mode, unused
|
||||
@param[in] test_if_locked_arg open flags
|
||||
|
||||
@return status
|
||||
@retval 0 OK
|
||||
@retval -1 Error, my_errno gives reason
|
||||
@retval 0 OK
|
||||
@retval -1 Error, my_errno gives reason
|
||||
*/
|
||||
|
||||
int ha_myisammrg::open(const char *name, int mode __attribute__((unused)),
|
||||
uint test_if_locked)
|
||||
uint test_if_locked_arg)
|
||||
{
|
||||
DBUG_ENTER("ha_myisammrg::open");
|
||||
DBUG_PRINT("myrg", ("name: '%s' table: 0x%lx", name, (long) table));
|
||||
DBUG_PRINT("myrg", ("test_if_locked: %u", test_if_locked));
|
||||
DBUG_PRINT("myrg", ("test_if_locked_arg: %u", test_if_locked_arg));
|
||||
|
||||
/* Save for later use. */
|
||||
this->test_if_locked= test_if_locked;
|
||||
test_if_locked= test_if_locked_arg;
|
||||
|
||||
/* retrieve children table list. */
|
||||
my_errno= 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue