summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2010-03-14 17:01:45 +0100
committerStaale Smedseng <staale.smedseng@sun.com>2010-03-14 17:01:45 +0100
commitc7fad393fd73cc941190fde1b56a2f9e68e9d132 (patch)
tree58c6509541b2a20be10d2701ee31d4394c45ad8a /sql/item.h
parent57a96c77dbd136b5f31f610d0270d7d7b111ddbb (diff)
downloadmariadb-git-c7fad393fd73cc941190fde1b56a2f9e68e9d132.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. 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.
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h
index 77b6e28e98b..34416feeb21 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* 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
@@ -3028,6 +3028,7 @@ public:
Item_cache_int(enum_field_types field_type_arg):
Item_cache(field_type_arg), value(0) {}
+ virtual void store(Item *item){ Item_cache::store(item); }
void store(Item *item, longlong val_arg);
double val_real();
longlong val_int();