fix bad test results

and actually disable -Wsuggest-override in columnstore

mysql-test/suite/sys_vars/r/sysvars_server_embedded.result

@@ -44,13 +44,8 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	ARIA_BLOCK_SIZE
 VARIABLE_SCOPE	GLOBAL
-<<<<<<< HEAD
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Block size to be used for Aria index pages
-=======
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Block size to be used for Aria index pages.
+VARIABLE_COMMENT	Block size to be used for Aria index pages
->>>>>>> e862484ea1d (Change some Aria ULONG variables to UINT)
 NUMERIC_MIN_VALUE	4096
 NUMERIC_MAX_VALUE	32768
 NUMERIC_BLOCK_SIZE	1024
@@ -59,13 +54,8 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	ARIA_CHECKPOINT_INTERVAL
 VARIABLE_SCOPE	GLOBAL
-<<<<<<< HEAD
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing
-=======
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
+VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing
->>>>>>> e862484ea1d (Change some Aria ULONG variables to UINT)
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@@ -74,13 +64,8 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	ARIA_CHECKPOINT_LOG_ACTIVITY
 VARIABLE_SCOPE	GLOBAL
-<<<<<<< HEAD
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log
-=======
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
+VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log
->>>>>>> e862484ea1d (Change some Aria ULONG variables to UINT)
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@@ -99,13 +84,8 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	ARIA_FORCE_START_AFTER_RECOVERY_FAILURES
 VARIABLE_SCOPE	GLOBAL
-<<<<<<< HEAD
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature
-=======
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
+VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature
->>>>>>> e862484ea1d (Change some Aria ULONG variables to UINT)
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	255
 NUMERIC_BLOCK_SIZE	1
@@ -204,13 +184,8 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	ARIA_PAGECACHE_FILE_HASH_SIZE
 VARIABLE_SCOPE	GLOBAL
-<<<<<<< HEAD
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files
-=======
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
+VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files
->>>>>>> e862484ea1d (Change some Aria ULONG variables to UINT)
 NUMERIC_MIN_VALUE	128
 NUMERIC_MAX_VALUE	16384
 NUMERIC_BLOCK_SIZE	1
@@ -249,13 +224,8 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	ARIA_REPAIR_THREADS
 VARIABLE_SCOPE	SESSION
-<<<<<<< HEAD
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair
-=======
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
+VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair
->>>>>>> e862484ea1d (Change some Aria ULONG variables to UINT)
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	128
 NUMERIC_BLOCK_SIZE	1

storage/columnstore/CMakeLists.txt

@@ -11,8 +11,8 @@ IF(NOT PLUGIN_PERFSCHEMA STREQUAL NO)
 ENDIF()
 
 # let's temporarily disable the warning, until ColumnStore is fixed
-MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-error=suggest-override")
+MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-error=suggest-override" DEBUG)
-MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-suggest-override")
+MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-suggest-override" DEBUG)
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -U_GLIBCXX_DEBUG -U_GLIBCXX_ASSERTIONS")
 
 # new gcc is quite buggy re. spurious warnings. let's shut it up