MCOL-4674 Fix ColumnStore to run MTR tests in a build directory

2025-04-18 21:44:02 +03:00 · 2021-04-13 11:25:25 +04:00 · 2021-04-13 11:25:25 +04:00 · 75e3bbc31e
commit 75e3bbc31e
parent d8b473329f
1874 changed files with 1 additions and 0 deletions
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@ -5,6 +5,7 @@ include_directories( ${ENGINE_COMMON_INCLUDES}
                     /usr/include/libxml2
                     ${SERVER_SOURCE_ROOT_DIR}/storage/maria )

+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../../)

 SET ( libcalmysql_SRCS
    ../../datatypes/mcs_datatype.cpp
--- a/mysql-test/columnstore/.gitignore
+++ b/mysql-test/columnstore/.gitignore
--- a/mysql-test/columnstore/README
+++ b/mysql-test/columnstore/README
--- a/mysql-test/columnstore/basic/failed.def
+++ b/mysql-test/columnstore/basic/failed.def
--- a/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_bin.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_swedish_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_swedish_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_char5_latin1_swedish_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_char5_latin1_swedish_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_bin.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_bin.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_bin.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_bin.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result
--- a/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result
+++ b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result
--- a/mysql-test/columnstore/basic/r/func_bit.result
+++ b/mysql-test/columnstore/basic/r/func_bit.result
--- a/mysql-test/columnstore/basic/r/func_bit_mcs.result
+++ b/mysql-test/columnstore/basic/r/func_bit_mcs.result
--- a/mysql-test/columnstore/basic/r/func_cast.result
+++ b/mysql-test/columnstore/basic/r/func_cast.result
--- a/mysql-test/columnstore/basic/r/func_period_diff.result
+++ b/mysql-test/columnstore/basic/r/func_period_diff.result
--- a/mysql-test/columnstore/basic/r/func_sec_to_time.result
+++ b/mysql-test/columnstore/basic/r/func_sec_to_time.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_insert-keeps-invalid-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_insert-keeps-invalid-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_insert-keeps-invalid-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_insert-keeps-invalid-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_insert-keeps-invalid-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_insert-keeps-invalid-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_insert-keeps-invalid-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_insert-keeps-invalid-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_insert-keeps-invalid-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_insert-keeps-invalid-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_insert-keeps-invalid-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_insert-keeps-invalid-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_insert-keeps-invalid-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_insert-keeps-invalid-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-max.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-min.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-min.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-within-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-within-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_insert-keeps-invalid-range.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_insert-keeps-invalid-range.result
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-max.result
+++ b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-max.result
--- a/Show More
+++ b/Show More