summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/mdl.h4
-rw-r--r--sql/sql_alloc.h2
-rw-r--r--sql/sql_list.h12
-rw-r--r--sql/sql_plist.h8
-rw-r--r--sql/sql_string.h2
5 files changed, 14 insertions, 14 deletions
diff --git a/sql/mdl.h b/sql/mdl.h
index a537022484f..952d97d301c 100644
--- a/sql/mdl.h
+++ b/sql/mdl.h
@@ -456,7 +456,7 @@ public:
static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
{ return alloc_root(mem_root, size); }
- static void operator delete(void *ptr, MEM_ROOT *mem_root) {}
+ static void operator delete(void *, MEM_ROOT *) {}
void init(MDL_key::enum_mdl_namespace namespace_arg,
const char *db_arg, const char *name_arg,
@@ -497,7 +497,7 @@ public:
is mandatory. Can only be used before the request has been
granted.
*/
- MDL_request& operator=(const MDL_request &rhs)
+ MDL_request& operator=(const MDL_request &)
{
ticket= NULL;
/* Do nothing, in particular, don't try to copy the key. */
diff --git a/sql/sql_alloc.h b/sql/sql_alloc.h
index c3bee260817..153b0401e29 100644
--- a/sql/sql_alloc.h
+++ b/sql/sql_alloc.h
@@ -39,7 +39,7 @@ public:
{ return alloc_root(mem_root, size); }
static void operator delete(void *ptr, size_t size) { TRASH_FREE(ptr, size); }
static void operator delete(void *, MEM_ROOT *){}
- static void operator delete[](void *ptr, MEM_ROOT *mem_root)
+ static void operator delete[](void *, MEM_ROOT *)
{ /* never called */ }
static void operator delete[](void *ptr, size_t size) { TRASH_FREE(ptr, size); }
#ifdef HAVE_valgrind
diff --git a/sql/sql_list.h b/sql/sql_list.h
index 311e601490b..1f069ef9388 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -164,7 +164,7 @@ public:
*/
bool copy(const base_list *rhs, MEM_ROOT *mem_root);
base_list(const base_list &rhs, MEM_ROOT *mem_root) { copy(&rhs, mem_root); }
- inline base_list(bool error) { }
+ inline base_list(bool) {}
inline bool push_back(void *info)
{
if (((*last)=new list_node(info, &end_of_list)))
@@ -533,10 +533,10 @@ public:
template <class T> class List_iterator_fast :public base_list_iterator
{
protected:
- inline T *replace(T *a) { return (T*) 0; }
- inline T *replace(List<T> &a) { return (T*) 0; }
- inline void remove(void) { }
- inline void after(T *a) { }
+ inline T *replace(T *) { return (T*) 0; }
+ inline T *replace(List<T> &) { return (T*) 0; }
+ inline void remove(void) {}
+ inline void after(T *) {}
inline T** ref(void) { return (T**) 0; }
public:
@@ -605,7 +605,7 @@ struct ilink
{
return (void*)my_malloc((uint)size, MYF(MY_WME | MY_FAE | ME_FATALERROR));
}
- static void operator delete(void* ptr_arg, size_t size)
+ static void operator delete(void* ptr_arg, size_t)
{
my_free(ptr_arg);
}
diff --git a/sql/sql_plist.h b/sql/sql_plist.h
index 14f6eb5e2aa..bb9889cc534 100644
--- a/sql/sql_plist.h
+++ b/sql/sql_plist.h
@@ -230,7 +230,7 @@ protected:
void reset() {}
void inc() {}
void dec() {}
- void swap(I_P_List_null_counter &rhs) {}
+ void swap(I_P_List_null_counter &) {}
};
@@ -262,14 +262,14 @@ public:
template <typename T> class I_P_List_no_push_back
{
protected:
- I_P_List_no_push_back(T **a) {};
- void set_last(T **a) {}
+ I_P_List_no_push_back(T **) {}
+ void set_last(T **) {}
/*
T** get_last() const method is intentionally left unimplemented
in order to prohibit usage of push_back() method in lists which
use this policy.
*/
- void swap(I_P_List_no_push_back<T> &rhs) {}
+ void swap(I_P_List_no_push_back<T> &) {}
};
diff --git a/sql/sql_string.h b/sql/sql_string.h
index afbfa157a2b..e30132a427d 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -190,7 +190,7 @@ public:
{ /* never called */ }
static void operator delete[](void *ptr, size_t size)
{ TRASH_FREE(ptr, size); }
- static void operator delete[](void *ptr, MEM_ROOT *mem_root)
+ static void operator delete[](void *, MEM_ROOT *)
{ /* never called */ }
~String() { free(); }