[Commits] Rev 4612: compiler warnings in spider in lp:~maria-captains/maria/10.0

Sergei Golubchik serg at mariadb.org
Thu Feb 19 12:28:04 EET 2015


At lp:~maria-captains/maria/10.0

------------------------------------------------------------
revno: 4612
revision-id: sergii at pisem.net-20150219102803-808wsccsu0no6sfa
parent: sergii at pisem.net-20150219092652-g0mul1tsytvb9lkn
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 10.0
timestamp: Thu 2015-02-19 11:28:03 +0100
message:
  compiler warnings in spider
=== modified file 'storage/spider/CMakeLists.txt'
--- a/storage/spider/CMakeLists.txt	2014-09-18 00:26:30 +0000
+++ b/storage/spider/CMakeLists.txt	2015-02-19 10:28:03 +0000
@@ -1,6 +1,11 @@
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_HANDLERSOCKET")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_HANDLERSOCKET")
 
+IF(HAVE_WVLA)
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-vla")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wno-vla")
+ENDIF()
+
 SET(SPIDER_SOURCES
   spd_param.cc spd_sys_table.cc spd_trx.cc spd_db_conn.cc spd_conn.cc
   spd_table.cc spd_direct_sql.cc spd_udf.cc spd_ping_table.cc

=== modified file 'storage/spider/ha_spider.cc'
--- a/storage/spider/ha_spider.cc	2014-09-30 17:31:14 +0000
+++ b/storage/spider/ha_spider.cc	2015-02-19 10:28:03 +0000
@@ -10967,7 +10967,7 @@ bool ha_spider::is_crashed() const
   DBUG_RETURN(FALSE);
 }
 
-bool ha_spider::auto_repair() const
+bool ha_spider::auto_repair(int) const
 {
   DBUG_ENTER("ha_spider::auto_repair");
   DBUG_PRINT("info",("spider this=%p", this));

=== modified file 'storage/spider/ha_spider.h'
--- a/storage/spider/ha_spider.h	2014-09-18 00:26:30 +0000
+++ b/storage/spider/ha_spider.h	2015-02-19 10:28:03 +0000
@@ -682,7 +682,7 @@ class ha_spider: public handler
     const char *name
   );
   bool is_crashed() const;
-  bool auto_repair() const;
+  bool auto_repair(int) const;
   int disable_indexes(
     uint mode
   );



More information about the commits mailing list