after merge fixes

Removed 


mysql-test/t/disabled.def:
  Disabled rp_ndb_dd_advance, becasue of random failures
mysql-test/t/rpl_ndb_dd_advance.test:
  Added big_test, as this test takes +600 seconds
plugin/daemon_example/daemon_example.c:
  Removed compiler warnings
sql/item_cmpfunc.cc:
  after merge fixes
sql/item_subselect.cc:
  after merge fixes
storage/ndb/src/common/util/ConfigValues.cpp:
  Removed declarations to nonexisting functions
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Removed not used function
storage/ndb/src/kernel/blocks/lgman.cpp:
  Removed not used variables
storage/ndb/src/kernel/blocks/pgman.cpp:
  Removed not used variables
storage/ndb/src/kernel/blocks/restore.cpp:
  Removed not used variables
storage/ndb/src/kernel/blocks/tsman.cpp:
  Removed not used variables
storage/ndb/src/kernel/vm/DynArr256.cpp:
  Removed not used variables
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Removed not used variables
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Removed not used variables
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
  Removed not used variable
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Removed not used variable
storage/ndb/tools/desc.cpp:
  Removed not used variable
support-files/compiler_warnings.supp:
  Added suppress message for hard to remove warning

1 files changed, 2 insertions, 2 deletions

diff --git a/plugin/daemon_example/daemon_example.c b/plugin/daemon_example/daemon_example.c
index 26d54157cbd..ed9fac7574f 100644
--- a/plugin/daemon_example/daemon_example.c
+++ b/plugin/daemon_example/daemon_example.c
@@ -40,7 +40,7 @@
     1                    failure (cannot happen)
 */
 
-static int daemon_example_plugin_init(void *p)
+static int daemon_example_plugin_init(void *p __attribute__ ((unused)))
 {
   return(0);
 }
@@ -59,7 +59,7 @@ static int daemon_example_plugin_init(void *p)
 
 */
 
-static int daemon_example_plugin_deinit(void *p)
+static int daemon_example_plugin_deinit(void *p __attribute__ ((unused)))
 {
   return(0);
 }