Merge branch 'develop' into release-1.1.1

Conflicts:
	Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md

CMakeLists.txt

@@ -72,7 +72,7 @@ endif()
 
 IF(DEFINED OLEVEL )
   if((OLEVEL GREATER -1) AND (OLEVEL LESS 4) )
-  	set(FLAGS "${FLAGS} -O${OLEVEL}" CACHE STRING "Compilation flags")
+    set(FLAGS "${FLAGS} -O${OLEVEL}" CACHE STRING "Compilation flags"  FORCE)
 	message(STATUS "Optimization level at: ${OLEVEL}")
   else()
 	message(WARNING "Optimization level was set to a bad value, ignoring it. (Valid values are 0-3)")
@@ -80,16 +80,17 @@ IF(DEFINED OLEVEL )
 endif()
 
 if(GCOV)
-  set(FLAGS "${FLAGS} -fprofile-arcs -ftest-coverage" CACHE STRING "Compilation flags")
+  set(FLAGS "${FLAGS} -fprofile-arcs -ftest-coverage" CACHE STRING "Compilation flags"  FORCE)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
 endif()
 
 if(FAKE_CODE)
-  set(FLAGS "${FLAGS} -DFAKE_CODE" CACHE STRING "Compilation flags")
+  set(FLAGS "${FLAGS} -DFAKE_CODE" CACHE STRING "Compilation flags"  FORCE)
 endif()
 
 if(PROFILE)
-  set(FLAGS "${FLAGS} -pg " CACHE STRING "Compilation flags")
+  message(STATUS "Profiling executables")
+  set(FLAGS "${FLAGS} -pg " CACHE STRING "Compilation flags" FORCE)
 endif()
 
 set(CMAKE_C_FLAGS "${FLAGS}")

Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md

@@ -56,7 +56,8 @@ There are a number bugs and known limitations within this version of MaxScale, t
 * Binlog Router Plugin is compatible with MySQL 5.6  
   Binlog Router Plugin currently does not work for MariaDB 5.5 and MariaDB 10.0 
 
-* LONGBLOG datatype is currently not supported.
+
+* LONGBLOB are currently not supported.
 
 * Galera Cluster variables, such as @@wsrep_node_name, are not resolved by the embedded MariaDB parser.
 
@@ -78,14 +79,14 @@ Both RPM and Debian packages are available for MaxScale in addition to the tar b
 
 * Ubuntu 12.04 LTS
 
-* Ubuntu 13.10
-
 * Ubuntu 14.04 LTS
 
 * Fedora 19
 
 * Fedora 20
 
+* Fedora 21
+
 * OpenSuSE 13
 
 * SuSE Linux Enterprise 11

macros.cmake

@@ -77,6 +77,9 @@ macro(set_variables)
   # Build extra tools
   set(BUILD_TOOLS FALSE CACHE BOOL "Build extra utility tools")
 
+  # Profiling
+  set(PROFILE FALSE CACHE BOOL "Profiling (gprof)")
+
 endmacro()
 
 macro(check_deps)