diff --git a/.drone.jsonnet b/.drone.jsonnet index 967690154..b2e401f38 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -119,8 +119,7 @@ local Pipeline(branch, platform, event, arch='amd64') = { if (std.split(platform, '/')[0] == 'opensuse') then 'docker exec -t mtr$${DRONE_BUILD_NUMBER} bash -c "zypper install -y which hostname rsyslog patch perl-Data-Dumper-Concise perl-Memoize-ExpireLRU && zypper install -y --allow-unsigned-rpm /result/*.' + pkg_format + '"' else '', if (std.split(platform, ':')[0] == 'centos') then 'docker exec -t mtr$${DRONE_BUILD_NUMBER} bash -c "yum install -y epel-release diffutils which rsyslog hostname patch perl-Data-Dumper perl-Getopt-Long perl-Memoize perl-Time-HiRes cracklib-dicts && yum install -y /result/*.' + pkg_format + '"' else '', if (pkg_format == 'deb') then 'docker exec -t mtr$${DRONE_BUILD_NUMBER} bash -c "apt update && apt install -y rsyslog hostname patch && apt install -y -f /result/*.' + pkg_format + '"' else '', - 'docker cp mtr mtr$${DRONE_BUILD_NUMBER}:' + mtr_path + '/suite/', - 'docker exec -t mtr$${DRONE_BUILD_NUMBER} mv ' + mtr_path + '/suite/mtr ' + mtr_path + '/suite/columnstore', + 'docker cp mysql-test/columnstore mtr$${DRONE_BUILD_NUMBER}:' + mtr_path + '/suite/', 'docker exec -t mtr$${DRONE_BUILD_NUMBER} chown -R mysql:mysql ' + mtr_path, // disable systemd 'ProtectSystem' (we need to write to /usr/share/) 'docker exec -t mtr$${DRONE_BUILD_NUMBER} sed -i "/ProtectSystem/d" /usr/lib/systemd/system/mariadb.service', @@ -359,7 +358,7 @@ local Pipeline(branch, platform, event, arch='amd64') = { volumes: [pipeline._volumes.mdb], commands: [ 'cd /mdb/' + builddir, - 'mkdir /drone/src/result', + 'mkdir -p /drone/src/result', 'echo "engine: $DRONE_COMMIT" > buildinfo.txt', 'echo "server: $$(git rev-parse HEAD)" >> buildinfo.txt', 'echo "buildNo: $DRONE_BUILD_NUMBER" >> buildinfo.txt', diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt index bda7fe263..ded9c6f4b 100644 --- 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 diff --git a/mtr/.gitignore b/mysql-test/columnstore/.gitignore similarity index 100% rename from mtr/.gitignore rename to mysql-test/columnstore/.gitignore diff --git a/mtr/README b/mysql-test/columnstore/README similarity index 100% rename from mtr/README rename to mysql-test/columnstore/README diff --git a/mtr/basic/failed.def b/mysql-test/columnstore/basic/failed.def similarity index 100% rename from mtr/basic/failed.def rename to mysql-test/columnstore/basic/failed.def diff --git a/mtr/basic/r/ctype_cmp_char4_latin1_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_bin.result similarity index 100% rename from mtr/basic/r/ctype_cmp_char4_latin1_bin.result rename to mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_bin.result diff --git a/mtr/basic/r/ctype_cmp_char4_latin1_swedish_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_swedish_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_char4_latin1_swedish_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_char4_latin1_swedish_ci.result diff --git a/mtr/basic/r/ctype_cmp_char5_latin1_swedish_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_char5_latin1_swedish_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_char5_latin1_swedish_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_char5_latin1_swedish_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_latin1_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_bin.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_latin1_bin.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_bin.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_nopad_bin.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_latin1_swedish_nopad_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_utf8_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_bin.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_utf8_bin.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_bin.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_utf8_general_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_utf8_general_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_general_nopad_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_nopad_bin.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar32_utf8_unicode_nopad_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_latin1_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_bin.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_latin1_bin.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_bin.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_nopad_bin.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_latin1_swedish_nopad_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_utf8_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_bin.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_utf8_bin.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_bin.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_utf8_general_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_utf8_general_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_general_nopad_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_nopad_bin.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_ci.result diff --git a/mtr/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result b/mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result similarity index 100% rename from mtr/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result rename to mysql-test/columnstore/basic/r/ctype_cmp_varchar4_utf8_unicode_nopad_ci.result diff --git a/mtr/basic/r/func_bit.result b/mysql-test/columnstore/basic/r/func_bit.result similarity index 100% rename from mtr/basic/r/func_bit.result rename to mysql-test/columnstore/basic/r/func_bit.result diff --git a/mtr/basic/r/func_bit_mcs.result b/mysql-test/columnstore/basic/r/func_bit_mcs.result similarity index 100% rename from mtr/basic/r/func_bit_mcs.result rename to mysql-test/columnstore/basic/r/func_bit_mcs.result diff --git a/mtr/basic/r/func_cast.result b/mysql-test/columnstore/basic/r/func_cast.result similarity index 100% rename from mtr/basic/r/func_cast.result rename to mysql-test/columnstore/basic/r/func_cast.result diff --git a/mtr/basic/r/func_period_diff.result b/mysql-test/columnstore/basic/r/func_period_diff.result similarity index 100% rename from mtr/basic/r/func_period_diff.result rename to mysql-test/columnstore/basic/r/func_period_diff.result diff --git a/mtr/basic/r/func_sec_to_time.result b/mysql-test/columnstore/basic/r/func_sec_to_time.result similarity index 100% rename from mtr/basic/r/func_sec_to_time.result rename to mysql-test/columnstore/basic/r/func_sec_to_time.result diff --git a/mtr/basic/r/mcol2044_signed_bigint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_bigint_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_bigint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_bigint_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_bigint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_bigint_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_signed_bigint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_bigint_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_bigint_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_signed_bigint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_bigint_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_bigint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_bigint_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_bigint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_bigint_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_signed_bigint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_bigint_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_signed_bigint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_bigint_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-within-range.result diff --git a/mtr/basic/r/mcol2044_signed_dec38_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_dec38_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_dec38_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_dec38_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_dec38_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_dec38_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_signed_dec38_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_dec38_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_dec38_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_signed_dec38_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_dec38_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_dec38_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_dec38_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_dec38_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_dec38_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_signed_dec38_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_dec38_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_signed_dec38_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_dec38_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-within-range.result diff --git a/mtr/basic/r/mcol2044_signed_integer_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_integer_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_integer_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_integer_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_integer_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_integer_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_signed_integer_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_integer_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_integer_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_signed_integer_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_integer_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_integer_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_integer_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_integer_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_integer_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_signed_integer_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_integer_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_signed_integer_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_integer_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-within-range.result diff --git a/mtr/basic/r/mcol2044_signed_smallint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_smallint_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_smallint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_smallint_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_smallint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_smallint_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_signed_smallint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_smallint_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_smallint_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_signed_smallint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_smallint_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_smallint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_smallint_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_smallint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_smallint_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_signed_smallint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_smallint_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_signed_smallint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_smallint_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-within-range.result diff --git a/mtr/basic/r/mcol2044_signed_tinyint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_tinyint_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_tinyint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_tinyint_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_tinyint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_tinyint_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_signed_tinyint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_tinyint_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_signed_tinyint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_tinyint_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_signed_tinyint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_tinyint_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_signed_tinyint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_tinyint_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_signed_tinyint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_tinyint_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_signed_tinyint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_signed_tinyint_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_bigint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_bigint_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_bigint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_bigint_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_bigint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_bigint_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_bigint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_bigint_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_bigint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_bigint_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_bigint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_bigint_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_bigint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_bigint_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_bigint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_bigint_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_bigint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_bigint_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_dec38_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_dec38_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_dec38_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_dec38_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_dec38_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_dec38_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_dec38_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_dec38_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_dec38_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_dec38_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_dec38_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_dec38_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_dec38_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_dec38_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_dec38_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_dec38_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_dec38_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_dec38_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_integer_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_integer_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_integer_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_integer_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_integer_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_integer_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_integer_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_integer_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_integer_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_integer_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_integer_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_integer_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_integer_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_integer_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_integer_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_integer_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_integer_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_integer_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_smallint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_smallint_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_smallint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_smallint_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_smallint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_smallint_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_smallint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_smallint_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_smallint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_smallint_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_smallint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_smallint_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_smallint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_smallint_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_smallint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_smallint_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_smallint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_smallint_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_tinyint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_tinyint_delete-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_tinyint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_tinyint_delete-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_tinyint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_tinyint_delete-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-within-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.result diff --git a/mtr/basic/r/mcol2044_unsigned_tinyint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_tinyint_update-drop-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_tinyint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_tinyint_update-drop-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_tinyint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-max.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_tinyint_update-extends-max.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-max.result diff --git a/mtr/basic/r/mcol2044_unsigned_tinyint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-min.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_tinyint_update-extends-min.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-min.result diff --git a/mtr/basic/r/mcol2044_unsigned_tinyint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-within-range.result similarity index 100% rename from mtr/basic/r/mcol2044_unsigned_tinyint_update-within-range.result rename to mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-within-range.result diff --git a/mtr/basic/r/mcol_2000.result b/mysql-test/columnstore/basic/r/mcol_2000.result similarity index 100% rename from mtr/basic/r/mcol_2000.result rename to mysql-test/columnstore/basic/r/mcol_2000.result diff --git a/mtr/basic/r/mcol_4222.result b/mysql-test/columnstore/basic/r/mcol_4222.result similarity index 100% rename from mtr/basic/r/mcol_4222.result rename to mysql-test/columnstore/basic/r/mcol_4222.result diff --git a/mtr/basic/r/mcs102_ldi_transform_csv.result b/mysql-test/columnstore/basic/r/mcs102_ldi_transform_csv.result similarity index 100% rename from mtr/basic/r/mcs102_ldi_transform_csv.result rename to mysql-test/columnstore/basic/r/mcs102_ldi_transform_csv.result diff --git a/mtr/basic/r/mcs103_ldi_fields_enclosed_by.result b/mysql-test/columnstore/basic/r/mcs103_ldi_fields_enclosed_by.result similarity index 100% rename from mtr/basic/r/mcs103_ldi_fields_enclosed_by.result rename to mysql-test/columnstore/basic/r/mcs103_ldi_fields_enclosed_by.result diff --git a/mtr/basic/r/mcs104_ldi_fields_escaped_by.result b/mysql-test/columnstore/basic/r/mcs104_ldi_fields_escaped_by.result similarity index 100% rename from mtr/basic/r/mcs104_ldi_fields_escaped_by.result rename to mysql-test/columnstore/basic/r/mcs104_ldi_fields_escaped_by.result diff --git a/mtr/basic/r/mcs105_ldi_lines_terminated_by.result b/mysql-test/columnstore/basic/r/mcs105_ldi_lines_terminated_by.result similarity index 100% rename from mtr/basic/r/mcs105_ldi_lines_terminated_by.result rename to mysql-test/columnstore/basic/r/mcs105_ldi_lines_terminated_by.result diff --git a/mtr/basic/r/mcs106_ldi_ignore_rows.result b/mysql-test/columnstore/basic/r/mcs106_ldi_ignore_rows.result similarity index 100% rename from mtr/basic/r/mcs106_ldi_ignore_rows.result rename to mysql-test/columnstore/basic/r/mcs106_ldi_ignore_rows.result diff --git a/mtr/basic/r/mcs10_drop_db_table.result b/mysql-test/columnstore/basic/r/mcs10_drop_db_table.result similarity index 100% rename from mtr/basic/r/mcs10_drop_db_table.result rename to mysql-test/columnstore/basic/r/mcs10_drop_db_table.result diff --git a/mtr/basic/r/mcs111_comparison_operators.result b/mysql-test/columnstore/basic/r/mcs111_comparison_operators.result similarity index 100% rename from mtr/basic/r/mcs111_comparison_operators.result rename to mysql-test/columnstore/basic/r/mcs111_comparison_operators.result diff --git a/mtr/basic/r/mcs114_comments.result b/mysql-test/columnstore/basic/r/mcs114_comments.result similarity index 100% rename from mtr/basic/r/mcs114_comments.result rename to mysql-test/columnstore/basic/r/mcs114_comments.result diff --git a/mtr/basic/r/mcs115_count_distinct.result b/mysql-test/columnstore/basic/r/mcs115_count_distinct.result similarity index 100% rename from mtr/basic/r/mcs115_count_distinct.result rename to mysql-test/columnstore/basic/r/mcs115_count_distinct.result diff --git a/mtr/basic/r/mcs116_create_or_replace.result b/mysql-test/columnstore/basic/r/mcs116_create_or_replace.result similarity index 100% rename from mtr/basic/r/mcs116_create_or_replace.result rename to mysql-test/columnstore/basic/r/mcs116_create_or_replace.result diff --git a/mtr/basic/r/mcs117_create_utf8.result b/mysql-test/columnstore/basic/r/mcs117_create_utf8.result similarity index 100% rename from mtr/basic/r/mcs117_create_utf8.result rename to mysql-test/columnstore/basic/r/mcs117_create_utf8.result diff --git a/mtr/basic/r/mcs118_charset_negative.result b/mysql-test/columnstore/basic/r/mcs118_charset_negative.result similarity index 100% rename from mtr/basic/r/mcs118_charset_negative.result rename to mysql-test/columnstore/basic/r/mcs118_charset_negative.result diff --git a/mtr/basic/r/mcs119_date_formats.result b/mysql-test/columnstore/basic/r/mcs119_date_formats.result similarity index 100% rename from mtr/basic/r/mcs119_date_formats.result rename to mysql-test/columnstore/basic/r/mcs119_date_formats.result diff --git a/mtr/basic/r/mcs11_show_db_table.result b/mysql-test/columnstore/basic/r/mcs11_show_db_table.result similarity index 100% rename from mtr/basic/r/mcs11_show_db_table.result rename to mysql-test/columnstore/basic/r/mcs11_show_db_table.result diff --git a/mtr/basic/r/mcs120_empty_table.result b/mysql-test/columnstore/basic/r/mcs120_empty_table.result similarity index 100% rename from mtr/basic/r/mcs120_empty_table.result rename to mysql-test/columnstore/basic/r/mcs120_empty_table.result diff --git a/mtr/basic/r/mcs123_window_function_cume_dist.result b/mysql-test/columnstore/basic/r/mcs123_window_function_cume_dist.result similarity index 100% rename from mtr/basic/r/mcs123_window_function_cume_dist.result rename to mysql-test/columnstore/basic/r/mcs123_window_function_cume_dist.result diff --git a/mtr/basic/r/mcs124_window_function_dense_rank.result b/mysql-test/columnstore/basic/r/mcs124_window_function_dense_rank.result similarity index 100% rename from mtr/basic/r/mcs124_window_function_dense_rank.result rename to mysql-test/columnstore/basic/r/mcs124_window_function_dense_rank.result diff --git a/mtr/basic/r/mcs125_window_function_first_value.result b/mysql-test/columnstore/basic/r/mcs125_window_function_first_value.result similarity index 100% rename from mtr/basic/r/mcs125_window_function_first_value.result rename to mysql-test/columnstore/basic/r/mcs125_window_function_first_value.result diff --git a/mtr/basic/r/mcs126_window_function_lag.result b/mysql-test/columnstore/basic/r/mcs126_window_function_lag.result similarity index 100% rename from mtr/basic/r/mcs126_window_function_lag.result rename to mysql-test/columnstore/basic/r/mcs126_window_function_lag.result diff --git a/mtr/basic/r/mcs127_window_function_last_value.result b/mysql-test/columnstore/basic/r/mcs127_window_function_last_value.result similarity index 100% rename from mtr/basic/r/mcs127_window_function_last_value.result rename to mysql-test/columnstore/basic/r/mcs127_window_function_last_value.result diff --git a/mtr/basic/r/mcs128_window_function_lead.result b/mysql-test/columnstore/basic/r/mcs128_window_function_lead.result similarity index 100% rename from mtr/basic/r/mcs128_window_function_lead.result rename to mysql-test/columnstore/basic/r/mcs128_window_function_lead.result diff --git a/mtr/basic/r/mcs129_window_function_nth_value.result b/mysql-test/columnstore/basic/r/mcs129_window_function_nth_value.result similarity index 100% rename from mtr/basic/r/mcs129_window_function_nth_value.result rename to mysql-test/columnstore/basic/r/mcs129_window_function_nth_value.result diff --git a/mtr/basic/r/mcs12_alter_table.result b/mysql-test/columnstore/basic/r/mcs12_alter_table.result similarity index 100% rename from mtr/basic/r/mcs12_alter_table.result rename to mysql-test/columnstore/basic/r/mcs12_alter_table.result diff --git a/mtr/basic/r/mcs130_window_function_ntile.result b/mysql-test/columnstore/basic/r/mcs130_window_function_ntile.result similarity index 100% rename from mtr/basic/r/mcs130_window_function_ntile.result rename to mysql-test/columnstore/basic/r/mcs130_window_function_ntile.result diff --git a/mtr/basic/r/mcs131_window_function_percent_rank.result b/mysql-test/columnstore/basic/r/mcs131_window_function_percent_rank.result similarity index 100% rename from mtr/basic/r/mcs131_window_function_percent_rank.result rename to mysql-test/columnstore/basic/r/mcs131_window_function_percent_rank.result diff --git a/mtr/basic/r/mcs132_window_function_percentile_cont.result b/mysql-test/columnstore/basic/r/mcs132_window_function_percentile_cont.result similarity index 100% rename from mtr/basic/r/mcs132_window_function_percentile_cont.result rename to mysql-test/columnstore/basic/r/mcs132_window_function_percentile_cont.result diff --git a/mtr/basic/r/mcs133_window_function_percentile_disc.result b/mysql-test/columnstore/basic/r/mcs133_window_function_percentile_disc.result similarity index 100% rename from mtr/basic/r/mcs133_window_function_percentile_disc.result rename to mysql-test/columnstore/basic/r/mcs133_window_function_percentile_disc.result diff --git a/mtr/basic/r/mcs134_window_function_rank.result b/mysql-test/columnstore/basic/r/mcs134_window_function_rank.result similarity index 100% rename from mtr/basic/r/mcs134_window_function_rank.result rename to mysql-test/columnstore/basic/r/mcs134_window_function_rank.result diff --git a/mtr/basic/r/mcs135_window_function_row_number.result b/mysql-test/columnstore/basic/r/mcs135_window_function_row_number.result similarity index 100% rename from mtr/basic/r/mcs135_window_function_row_number.result rename to mysql-test/columnstore/basic/r/mcs135_window_function_row_number.result diff --git a/mtr/basic/r/mcs136_window_function_sum.result b/mysql-test/columnstore/basic/r/mcs136_window_function_sum.result similarity index 100% rename from mtr/basic/r/mcs136_window_function_sum.result rename to mysql-test/columnstore/basic/r/mcs136_window_function_sum.result diff --git a/mtr/basic/r/mcs137_window_function_count.result b/mysql-test/columnstore/basic/r/mcs137_window_function_count.result similarity index 100% rename from mtr/basic/r/mcs137_window_function_count.result rename to mysql-test/columnstore/basic/r/mcs137_window_function_count.result diff --git a/mtr/basic/r/mcs138_window_function_max.result b/mysql-test/columnstore/basic/r/mcs138_window_function_max.result similarity index 100% rename from mtr/basic/r/mcs138_window_function_max.result rename to mysql-test/columnstore/basic/r/mcs138_window_function_max.result diff --git a/mtr/basic/r/mcs139_window_function_min.result b/mysql-test/columnstore/basic/r/mcs139_window_function_min.result similarity index 100% rename from mtr/basic/r/mcs139_window_function_min.result rename to mysql-test/columnstore/basic/r/mcs139_window_function_min.result diff --git a/mtr/basic/r/mcs13_alter_table_negative.result b/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result similarity index 100% rename from mtr/basic/r/mcs13_alter_table_negative.result rename to mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result diff --git a/mtr/basic/r/mcs140_window_function_median.result b/mysql-test/columnstore/basic/r/mcs140_window_function_median.result similarity index 100% rename from mtr/basic/r/mcs140_window_function_median.result rename to mysql-test/columnstore/basic/r/mcs140_window_function_median.result diff --git a/mtr/basic/r/mcs141_window_function_std.result b/mysql-test/columnstore/basic/r/mcs141_window_function_std.result similarity index 100% rename from mtr/basic/r/mcs141_window_function_std.result rename to mysql-test/columnstore/basic/r/mcs141_window_function_std.result diff --git a/mtr/basic/r/mcs142_window_function_stddev.result b/mysql-test/columnstore/basic/r/mcs142_window_function_stddev.result similarity index 100% rename from mtr/basic/r/mcs142_window_function_stddev.result rename to mysql-test/columnstore/basic/r/mcs142_window_function_stddev.result diff --git a/mtr/basic/r/mcs143_window_function_stddev_pop.result b/mysql-test/columnstore/basic/r/mcs143_window_function_stddev_pop.result similarity index 100% rename from mtr/basic/r/mcs143_window_function_stddev_pop.result rename to mysql-test/columnstore/basic/r/mcs143_window_function_stddev_pop.result diff --git a/mtr/basic/r/mcs144_window_function_stddev_samp.result b/mysql-test/columnstore/basic/r/mcs144_window_function_stddev_samp.result similarity index 100% rename from mtr/basic/r/mcs144_window_function_stddev_samp.result rename to mysql-test/columnstore/basic/r/mcs144_window_function_stddev_samp.result diff --git a/mtr/basic/r/mcs145_window_function_variance.result b/mysql-test/columnstore/basic/r/mcs145_window_function_variance.result similarity index 100% rename from mtr/basic/r/mcs145_window_function_variance.result rename to mysql-test/columnstore/basic/r/mcs145_window_function_variance.result diff --git a/mtr/basic/r/mcs146_window_function_var_pop.result b/mysql-test/columnstore/basic/r/mcs146_window_function_var_pop.result similarity index 100% rename from mtr/basic/r/mcs146_window_function_var_pop.result rename to mysql-test/columnstore/basic/r/mcs146_window_function_var_pop.result diff --git a/mtr/basic/r/mcs147_window_function_var_samp.result b/mysql-test/columnstore/basic/r/mcs147_window_function_var_samp.result similarity index 100% rename from mtr/basic/r/mcs147_window_function_var_samp.result rename to mysql-test/columnstore/basic/r/mcs147_window_function_var_samp.result diff --git a/mtr/basic/r/mcs148_window_function_bit_or.result b/mysql-test/columnstore/basic/r/mcs148_window_function_bit_or.result similarity index 100% rename from mtr/basic/r/mcs148_window_function_bit_or.result rename to mysql-test/columnstore/basic/r/mcs148_window_function_bit_or.result diff --git a/mtr/basic/r/mcs149_window_function_bit_and.result b/mysql-test/columnstore/basic/r/mcs149_window_function_bit_and.result similarity index 100% rename from mtr/basic/r/mcs149_window_function_bit_and.result rename to mysql-test/columnstore/basic/r/mcs149_window_function_bit_and.result diff --git a/mtr/basic/r/mcs14_truncate_table.result b/mysql-test/columnstore/basic/r/mcs14_truncate_table.result similarity index 100% rename from mtr/basic/r/mcs14_truncate_table.result rename to mysql-test/columnstore/basic/r/mcs14_truncate_table.result diff --git a/mtr/basic/r/mcs150_window_function_bit_xor.result b/mysql-test/columnstore/basic/r/mcs150_window_function_bit_xor.result similarity index 100% rename from mtr/basic/r/mcs150_window_function_bit_xor.result rename to mysql-test/columnstore/basic/r/mcs150_window_function_bit_xor.result diff --git a/mtr/basic/r/mcs151_window_function_avg.result b/mysql-test/columnstore/basic/r/mcs151_window_function_avg.result similarity index 100% rename from mtr/basic/r/mcs151_window_function_avg.result rename to mysql-test/columnstore/basic/r/mcs151_window_function_avg.result diff --git a/mtr/basic/r/mcs152_win_frame_avg.result b/mysql-test/columnstore/basic/r/mcs152_win_frame_avg.result similarity index 100% rename from mtr/basic/r/mcs152_win_frame_avg.result rename to mysql-test/columnstore/basic/r/mcs152_win_frame_avg.result diff --git a/mtr/basic/r/mcs153_win_frame_bit_and.result b/mysql-test/columnstore/basic/r/mcs153_win_frame_bit_and.result similarity index 100% rename from mtr/basic/r/mcs153_win_frame_bit_and.result rename to mysql-test/columnstore/basic/r/mcs153_win_frame_bit_and.result diff --git a/mtr/basic/r/mcs154_win_frame_bit_or.result b/mysql-test/columnstore/basic/r/mcs154_win_frame_bit_or.result similarity index 100% rename from mtr/basic/r/mcs154_win_frame_bit_or.result rename to mysql-test/columnstore/basic/r/mcs154_win_frame_bit_or.result diff --git a/mtr/basic/r/mcs155_win_frame_bit_xor.result b/mysql-test/columnstore/basic/r/mcs155_win_frame_bit_xor.result similarity index 100% rename from mtr/basic/r/mcs155_win_frame_bit_xor.result rename to mysql-test/columnstore/basic/r/mcs155_win_frame_bit_xor.result diff --git a/mtr/basic/r/mcs156_win_frame_count.result b/mysql-test/columnstore/basic/r/mcs156_win_frame_count.result similarity index 100% rename from mtr/basic/r/mcs156_win_frame_count.result rename to mysql-test/columnstore/basic/r/mcs156_win_frame_count.result diff --git a/mtr/basic/r/mcs157_win_frame_lead.result b/mysql-test/columnstore/basic/r/mcs157_win_frame_lead.result similarity index 100% rename from mtr/basic/r/mcs157_win_frame_lead.result rename to mysql-test/columnstore/basic/r/mcs157_win_frame_lead.result diff --git a/mtr/basic/r/mcs158_win_frame_max.result b/mysql-test/columnstore/basic/r/mcs158_win_frame_max.result similarity index 100% rename from mtr/basic/r/mcs158_win_frame_max.result rename to mysql-test/columnstore/basic/r/mcs158_win_frame_max.result diff --git a/mtr/basic/r/mcs159_win_frame_min.result b/mysql-test/columnstore/basic/r/mcs159_win_frame_min.result similarity index 100% rename from mtr/basic/r/mcs159_win_frame_min.result rename to mysql-test/columnstore/basic/r/mcs159_win_frame_min.result diff --git a/mtr/basic/r/mcs15_views_create_query_drop.result b/mysql-test/columnstore/basic/r/mcs15_views_create_query_drop.result similarity index 100% rename from mtr/basic/r/mcs15_views_create_query_drop.result rename to mysql-test/columnstore/basic/r/mcs15_views_create_query_drop.result diff --git a/mtr/basic/r/mcs160_win_frame_ntile.result b/mysql-test/columnstore/basic/r/mcs160_win_frame_ntile.result similarity index 100% rename from mtr/basic/r/mcs160_win_frame_ntile.result rename to mysql-test/columnstore/basic/r/mcs160_win_frame_ntile.result diff --git a/mtr/basic/r/mcs161_win_frame_std.result b/mysql-test/columnstore/basic/r/mcs161_win_frame_std.result similarity index 100% rename from mtr/basic/r/mcs161_win_frame_std.result rename to mysql-test/columnstore/basic/r/mcs161_win_frame_std.result diff --git a/mtr/basic/r/mcs162_win_frame_stddev.result b/mysql-test/columnstore/basic/r/mcs162_win_frame_stddev.result similarity index 100% rename from mtr/basic/r/mcs162_win_frame_stddev.result rename to mysql-test/columnstore/basic/r/mcs162_win_frame_stddev.result diff --git a/mtr/basic/r/mcs163_win_frame_stddev_pop.result b/mysql-test/columnstore/basic/r/mcs163_win_frame_stddev_pop.result similarity index 100% rename from mtr/basic/r/mcs163_win_frame_stddev_pop.result rename to mysql-test/columnstore/basic/r/mcs163_win_frame_stddev_pop.result diff --git a/mtr/basic/r/mcs164_win_frame_stddev_samp.result b/mysql-test/columnstore/basic/r/mcs164_win_frame_stddev_samp.result similarity index 100% rename from mtr/basic/r/mcs164_win_frame_stddev_samp.result rename to mysql-test/columnstore/basic/r/mcs164_win_frame_stddev_samp.result diff --git a/mtr/basic/r/mcs165_win_frame_sum.result b/mysql-test/columnstore/basic/r/mcs165_win_frame_sum.result similarity index 100% rename from mtr/basic/r/mcs165_win_frame_sum.result rename to mysql-test/columnstore/basic/r/mcs165_win_frame_sum.result diff --git a/mtr/basic/r/mcs166_win_frame_var_pop.result b/mysql-test/columnstore/basic/r/mcs166_win_frame_var_pop.result similarity index 100% rename from mtr/basic/r/mcs166_win_frame_var_pop.result rename to mysql-test/columnstore/basic/r/mcs166_win_frame_var_pop.result diff --git a/mtr/basic/r/mcs167_win_frame_var_samp.result b/mysql-test/columnstore/basic/r/mcs167_win_frame_var_samp.result similarity index 100% rename from mtr/basic/r/mcs167_win_frame_var_samp.result rename to mysql-test/columnstore/basic/r/mcs167_win_frame_var_samp.result diff --git a/mtr/basic/r/mcs168_win_frame_variance.result b/mysql-test/columnstore/basic/r/mcs168_win_frame_variance.result similarity index 100% rename from mtr/basic/r/mcs168_win_frame_variance.result rename to mysql-test/columnstore/basic/r/mcs168_win_frame_variance.result diff --git a/mtr/basic/r/mcs169_bin_functions.result b/mysql-test/columnstore/basic/r/mcs169_bin_functions.result similarity index 100% rename from mtr/basic/r/mcs169_bin_functions.result rename to mysql-test/columnstore/basic/r/mcs169_bin_functions.result diff --git a/mtr/basic/r/mcs16_functions_define_call_drop.result b/mysql-test/columnstore/basic/r/mcs16_functions_define_call_drop.result similarity index 100% rename from mtr/basic/r/mcs16_functions_define_call_drop.result rename to mysql-test/columnstore/basic/r/mcs16_functions_define_call_drop.result diff --git a/mtr/basic/r/mcs170_session_functions.result b/mysql-test/columnstore/basic/r/mcs170_session_functions.result similarity index 100% rename from mtr/basic/r/mcs170_session_functions.result rename to mysql-test/columnstore/basic/r/mcs170_session_functions.result diff --git a/mtr/basic/r/mcs171_null_functions.result b/mysql-test/columnstore/basic/r/mcs171_null_functions.result similarity index 100% rename from mtr/basic/r/mcs171_null_functions.result rename to mysql-test/columnstore/basic/r/mcs171_null_functions.result diff --git a/mtr/basic/r/mcs172_last_insert_id.result b/mysql-test/columnstore/basic/r/mcs172_last_insert_id.result similarity index 100% rename from mtr/basic/r/mcs172_last_insert_id.result rename to mysql-test/columnstore/basic/r/mcs172_last_insert_id.result diff --git a/mtr/basic/r/mcs173_coalesce_function.result b/mysql-test/columnstore/basic/r/mcs173_coalesce_function.result similarity index 100% rename from mtr/basic/r/mcs173_coalesce_function.result rename to mysql-test/columnstore/basic/r/mcs173_coalesce_function.result diff --git a/mtr/basic/r/mcs174_case_function.result b/mysql-test/columnstore/basic/r/mcs174_case_function.result similarity index 100% rename from mtr/basic/r/mcs174_case_function.result rename to mysql-test/columnstore/basic/r/mcs174_case_function.result diff --git a/mtr/basic/r/mcs175_convert_functions.result b/mysql-test/columnstore/basic/r/mcs175_convert_functions.result similarity index 100% rename from mtr/basic/r/mcs175_convert_functions.result rename to mysql-test/columnstore/basic/r/mcs175_convert_functions.result diff --git a/mtr/basic/r/mcs176_if_function.result b/mysql-test/columnstore/basic/r/mcs176_if_function.result similarity index 100% rename from mtr/basic/r/mcs176_if_function.result rename to mysql-test/columnstore/basic/r/mcs176_if_function.result diff --git a/mtr/basic/r/mcs177_bitwise_operators.result b/mysql-test/columnstore/basic/r/mcs177_bitwise_operators.result similarity index 100% rename from mtr/basic/r/mcs177_bitwise_operators.result rename to mysql-test/columnstore/basic/r/mcs177_bitwise_operators.result diff --git a/mtr/basic/r/mcs178_adddate_function.result b/mysql-test/columnstore/basic/r/mcs178_adddate_function.result similarity index 100% rename from mtr/basic/r/mcs178_adddate_function.result rename to mysql-test/columnstore/basic/r/mcs178_adddate_function.result diff --git a/mtr/basic/r/mcs179_addtime_function.result b/mysql-test/columnstore/basic/r/mcs179_addtime_function.result similarity index 100% rename from mtr/basic/r/mcs179_addtime_function.result rename to mysql-test/columnstore/basic/r/mcs179_addtime_function.result diff --git a/mtr/basic/r/mcs17_procedures_define_call_drop.result b/mysql-test/columnstore/basic/r/mcs17_procedures_define_call_drop.result similarity index 100% rename from mtr/basic/r/mcs17_procedures_define_call_drop.result rename to mysql-test/columnstore/basic/r/mcs17_procedures_define_call_drop.result diff --git a/mtr/basic/r/mcs180_ascii_function.result b/mysql-test/columnstore/basic/r/mcs180_ascii_function.result similarity index 100% rename from mtr/basic/r/mcs180_ascii_function.result rename to mysql-test/columnstore/basic/r/mcs180_ascii_function.result diff --git a/mtr/basic/r/mcs181_between_and.result b/mysql-test/columnstore/basic/r/mcs181_between_and.result similarity index 100% rename from mtr/basic/r/mcs181_between_and.result rename to mysql-test/columnstore/basic/r/mcs181_between_and.result diff --git a/mtr/basic/r/mcs182_char_length_function.result b/mysql-test/columnstore/basic/r/mcs182_char_length_function.result similarity index 100% rename from mtr/basic/r/mcs182_char_length_function.result rename to mysql-test/columnstore/basic/r/mcs182_char_length_function.result diff --git a/mtr/basic/r/mcs183_date_function.result b/mysql-test/columnstore/basic/r/mcs183_date_function.result similarity index 100% rename from mtr/basic/r/mcs183_date_function.result rename to mysql-test/columnstore/basic/r/mcs183_date_function.result diff --git a/mtr/basic/r/mcs184_day_function.result b/mysql-test/columnstore/basic/r/mcs184_day_function.result similarity index 100% rename from mtr/basic/r/mcs184_day_function.result rename to mysql-test/columnstore/basic/r/mcs184_day_function.result diff --git a/mtr/basic/r/mcs185_dayname_function.result b/mysql-test/columnstore/basic/r/mcs185_dayname_function.result similarity index 100% rename from mtr/basic/r/mcs185_dayname_function.result rename to mysql-test/columnstore/basic/r/mcs185_dayname_function.result diff --git a/mtr/basic/r/mcs186_dayofyear_function.result b/mysql-test/columnstore/basic/r/mcs186_dayofyear_function.result similarity index 100% rename from mtr/basic/r/mcs186_dayofyear_function.result rename to mysql-test/columnstore/basic/r/mcs186_dayofyear_function.result diff --git a/mtr/basic/r/mcs187_dayofmonth_function.result b/mysql-test/columnstore/basic/r/mcs187_dayofmonth_function.result similarity index 100% rename from mtr/basic/r/mcs187_dayofmonth_function.result rename to mysql-test/columnstore/basic/r/mcs187_dayofmonth_function.result diff --git a/mtr/basic/r/mcs188_avg_function.result b/mysql-test/columnstore/basic/r/mcs188_avg_function.result similarity index 100% rename from mtr/basic/r/mcs188_avg_function.result rename to mysql-test/columnstore/basic/r/mcs188_avg_function.result diff --git a/mtr/basic/r/mcs189_sum_function.result b/mysql-test/columnstore/basic/r/mcs189_sum_function.result similarity index 100% rename from mtr/basic/r/mcs189_sum_function.result rename to mysql-test/columnstore/basic/r/mcs189_sum_function.result diff --git a/mtr/basic/r/mcs18_create_drop_users.result b/mysql-test/columnstore/basic/r/mcs18_create_drop_users.result similarity index 100% rename from mtr/basic/r/mcs18_create_drop_users.result rename to mysql-test/columnstore/basic/r/mcs18_create_drop_users.result diff --git a/mtr/basic/r/mcs190_max_function.result b/mysql-test/columnstore/basic/r/mcs190_max_function.result similarity index 100% rename from mtr/basic/r/mcs190_max_function.result rename to mysql-test/columnstore/basic/r/mcs190_max_function.result diff --git a/mtr/basic/r/mcs191_min_function.result b/mysql-test/columnstore/basic/r/mcs191_min_function.result similarity index 100% rename from mtr/basic/r/mcs191_min_function.result rename to mysql-test/columnstore/basic/r/mcs191_min_function.result diff --git a/mtr/basic/r/mcs192_corr_function.result b/mysql-test/columnstore/basic/r/mcs192_corr_function.result similarity index 100% rename from mtr/basic/r/mcs192_corr_function.result rename to mysql-test/columnstore/basic/r/mcs192_corr_function.result diff --git a/mtr/basic/r/mcs193_covar_pop_function.result b/mysql-test/columnstore/basic/r/mcs193_covar_pop_function.result similarity index 100% rename from mtr/basic/r/mcs193_covar_pop_function.result rename to mysql-test/columnstore/basic/r/mcs193_covar_pop_function.result diff --git a/mtr/basic/r/mcs194_covar_samp_function.result b/mysql-test/columnstore/basic/r/mcs194_covar_samp_function.result similarity index 100% rename from mtr/basic/r/mcs194_covar_samp_function.result rename to mysql-test/columnstore/basic/r/mcs194_covar_samp_function.result diff --git a/mtr/basic/r/mcs195_regr_avgx_avgy_function.result b/mysql-test/columnstore/basic/r/mcs195_regr_avgx_avgy_function.result similarity index 100% rename from mtr/basic/r/mcs195_regr_avgx_avgy_function.result rename to mysql-test/columnstore/basic/r/mcs195_regr_avgx_avgy_function.result diff --git a/mtr/basic/r/mcs196_regr_sxx_sxy_syy_functions.result b/mysql-test/columnstore/basic/r/mcs196_regr_sxx_sxy_syy_functions.result similarity index 100% rename from mtr/basic/r/mcs196_regr_sxx_sxy_syy_functions.result rename to mysql-test/columnstore/basic/r/mcs196_regr_sxx_sxy_syy_functions.result diff --git a/mtr/basic/r/mcs197_regr_count_function.result b/mysql-test/columnstore/basic/r/mcs197_regr_count_function.result similarity index 100% rename from mtr/basic/r/mcs197_regr_count_function.result rename to mysql-test/columnstore/basic/r/mcs197_regr_count_function.result diff --git a/mtr/basic/r/mcs198_regr_intercept_function.result b/mysql-test/columnstore/basic/r/mcs198_regr_intercept_function.result similarity index 100% rename from mtr/basic/r/mcs198_regr_intercept_function.result rename to mysql-test/columnstore/basic/r/mcs198_regr_intercept_function.result diff --git a/mtr/basic/r/mcs199_regr_r2_function.result b/mysql-test/columnstore/basic/r/mcs199_regr_r2_function.result similarity index 100% rename from mtr/basic/r/mcs199_regr_r2_function.result rename to mysql-test/columnstore/basic/r/mcs199_regr_r2_function.result diff --git a/mtr/basic/r/mcs19_grant_revoke.result b/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result similarity index 100% rename from mtr/basic/r/mcs19_grant_revoke.result rename to mysql-test/columnstore/basic/r/mcs19_grant_revoke.result diff --git a/mtr/basic/r/mcs1_create_table_data_types.result b/mysql-test/columnstore/basic/r/mcs1_create_table_data_types.result similarity index 100% rename from mtr/basic/r/mcs1_create_table_data_types.result rename to mysql-test/columnstore/basic/r/mcs1_create_table_data_types.result diff --git a/mtr/basic/r/mcs200_regr_slope_function.result b/mysql-test/columnstore/basic/r/mcs200_regr_slope_function.result similarity index 100% rename from mtr/basic/r/mcs200_regr_slope_function.result rename to mysql-test/columnstore/basic/r/mcs200_regr_slope_function.result diff --git a/mtr/basic/r/mcs201_calshowpartitions_function.result b/mysql-test/columnstore/basic/r/mcs201_calshowpartitions_function.result similarity index 100% rename from mtr/basic/r/mcs201_calshowpartitions_function.result rename to mysql-test/columnstore/basic/r/mcs201_calshowpartitions_function.result diff --git a/mtr/basic/r/mcs202_caldisablepartitions_function.result b/mysql-test/columnstore/basic/r/mcs202_caldisablepartitions_function.result similarity index 100% rename from mtr/basic/r/mcs202_caldisablepartitions_function.result rename to mysql-test/columnstore/basic/r/mcs202_caldisablepartitions_function.result diff --git a/mtr/basic/r/mcs203_calenablepartitions_function.result b/mysql-test/columnstore/basic/r/mcs203_calenablepartitions_function.result similarity index 100% rename from mtr/basic/r/mcs203_calenablepartitions_function.result rename to mysql-test/columnstore/basic/r/mcs203_calenablepartitions_function.result diff --git a/mtr/basic/r/mcs204_caldroppartitions_function.result b/mysql-test/columnstore/basic/r/mcs204_caldroppartitions_function.result similarity index 100% rename from mtr/basic/r/mcs204_caldroppartitions_function.result rename to mysql-test/columnstore/basic/r/mcs204_caldroppartitions_function.result diff --git a/mtr/basic/r/mcs205_inet_aton_function.result b/mysql-test/columnstore/basic/r/mcs205_inet_aton_function.result similarity index 100% rename from mtr/basic/r/mcs205_inet_aton_function.result rename to mysql-test/columnstore/basic/r/mcs205_inet_aton_function.result diff --git a/mtr/basic/r/mcs206_inet_ntoa_function.result b/mysql-test/columnstore/basic/r/mcs206_inet_ntoa_function.result similarity index 100% rename from mtr/basic/r/mcs206_inet_ntoa_function.result rename to mysql-test/columnstore/basic/r/mcs206_inet_ntoa_function.result diff --git a/mtr/basic/r/mcs207_utility_functions.result b/mysql-test/columnstore/basic/r/mcs207_utility_functions.result similarity index 100% rename from mtr/basic/r/mcs207_utility_functions.result rename to mysql-test/columnstore/basic/r/mcs207_utility_functions.result diff --git a/mtr/basic/r/mcs208_idbPartition_function.result b/mysql-test/columnstore/basic/r/mcs208_idbPartition_function.result similarity index 100% rename from mtr/basic/r/mcs208_idbPartition_function.result rename to mysql-test/columnstore/basic/r/mcs208_idbPartition_function.result diff --git a/mtr/basic/r/mcs209_idbDBRoot_function.result b/mysql-test/columnstore/basic/r/mcs209_idbDBRoot_function.result similarity index 100% rename from mtr/basic/r/mcs209_idbDBRoot_function.result rename to mysql-test/columnstore/basic/r/mcs209_idbDBRoot_function.result diff --git a/mtr/basic/r/mcs20_insert_all_data_types.result b/mysql-test/columnstore/basic/r/mcs20_insert_all_data_types.result similarity index 100% rename from mtr/basic/r/mcs20_insert_all_data_types.result rename to mysql-test/columnstore/basic/r/mcs20_insert_all_data_types.result diff --git a/mtr/basic/r/mcs210_idbPm_function.result b/mysql-test/columnstore/basic/r/mcs210_idbPm_function.result similarity index 100% rename from mtr/basic/r/mcs210_idbPm_function.result rename to mysql-test/columnstore/basic/r/mcs210_idbPm_function.result diff --git a/mtr/basic/r/mcs211_idbExtentId_function.result b/mysql-test/columnstore/basic/r/mcs211_idbExtentId_function.result similarity index 100% rename from mtr/basic/r/mcs211_idbExtentId_function.result rename to mysql-test/columnstore/basic/r/mcs211_idbExtentId_function.result diff --git a/mtr/basic/r/mcs212_idbExtentMax_function.result b/mysql-test/columnstore/basic/r/mcs212_idbExtentMax_function.result similarity index 100% rename from mtr/basic/r/mcs212_idbExtentMax_function.result rename to mysql-test/columnstore/basic/r/mcs212_idbExtentMax_function.result diff --git a/mtr/basic/r/mcs213_idbExtentMin_function.result b/mysql-test/columnstore/basic/r/mcs213_idbExtentMin_function.result similarity index 100% rename from mtr/basic/r/mcs213_idbExtentMin_function.result rename to mysql-test/columnstore/basic/r/mcs213_idbExtentMin_function.result diff --git a/mtr/basic/r/mcs214_idbExtentRelativeRid_function.result b/mysql-test/columnstore/basic/r/mcs214_idbExtentRelativeRid_function.result similarity index 100% rename from mtr/basic/r/mcs214_idbExtentRelativeRid_function.result rename to mysql-test/columnstore/basic/r/mcs214_idbExtentRelativeRid_function.result diff --git a/mtr/basic/r/mcs215_idbSegment_function.result b/mysql-test/columnstore/basic/r/mcs215_idbSegment_function.result similarity index 100% rename from mtr/basic/r/mcs215_idbSegment_function.result rename to mysql-test/columnstore/basic/r/mcs215_idbSegment_function.result diff --git a/mtr/basic/r/mcs216_idbSegmentDir_function.result b/mysql-test/columnstore/basic/r/mcs216_idbSegmentDir_function.result similarity index 100% rename from mtr/basic/r/mcs216_idbSegmentDir_function.result rename to mysql-test/columnstore/basic/r/mcs216_idbSegmentDir_function.result diff --git a/mtr/basic/r/mcs217_makedate_function.result b/mysql-test/columnstore/basic/r/mcs217_makedate_function.result similarity index 100% rename from mtr/basic/r/mcs217_makedate_function.result rename to mysql-test/columnstore/basic/r/mcs217_makedate_function.result diff --git a/mtr/basic/r/mcs218_md5_function.result b/mysql-test/columnstore/basic/r/mcs218_md5_function.result similarity index 100% rename from mtr/basic/r/mcs218_md5_function.result rename to mysql-test/columnstore/basic/r/mcs218_md5_function.result diff --git a/mtr/basic/r/mcs219_mid_function.result b/mysql-test/columnstore/basic/r/mcs219_mid_function.result similarity index 100% rename from mtr/basic/r/mcs219_mid_function.result rename to mysql-test/columnstore/basic/r/mcs219_mid_function.result diff --git a/mtr/basic/r/mcs21_insert_all_charset_collation.result b/mysql-test/columnstore/basic/r/mcs21_insert_all_charset_collation.result similarity index 100% rename from mtr/basic/r/mcs21_insert_all_charset_collation.result rename to mysql-test/columnstore/basic/r/mcs21_insert_all_charset_collation.result diff --git a/mtr/basic/r/mcs220_period_add_function.result b/mysql-test/columnstore/basic/r/mcs220_period_add_function.result similarity index 100% rename from mtr/basic/r/mcs220_period_add_function.result rename to mysql-test/columnstore/basic/r/mcs220_period_add_function.result diff --git a/mtr/basic/r/mcs221_period_diff_function.result b/mysql-test/columnstore/basic/r/mcs221_period_diff_function.result similarity index 100% rename from mtr/basic/r/mcs221_period_diff_function.result rename to mysql-test/columnstore/basic/r/mcs221_period_diff_function.result diff --git a/mtr/basic/r/mcs222_position_function.result b/mysql-test/columnstore/basic/r/mcs222_position_function.result similarity index 100% rename from mtr/basic/r/mcs222_position_function.result rename to mysql-test/columnstore/basic/r/mcs222_position_function.result diff --git a/mtr/basic/r/mcs223_quarter_function.result b/mysql-test/columnstore/basic/r/mcs223_quarter_function.result similarity index 100% rename from mtr/basic/r/mcs223_quarter_function.result rename to mysql-test/columnstore/basic/r/mcs223_quarter_function.result diff --git a/mtr/basic/r/mcs224_repeat_function.result b/mysql-test/columnstore/basic/r/mcs224_repeat_function.result similarity index 100% rename from mtr/basic/r/mcs224_repeat_function.result rename to mysql-test/columnstore/basic/r/mcs224_repeat_function.result diff --git a/mtr/basic/r/mcs225_replace_function.result b/mysql-test/columnstore/basic/r/mcs225_replace_function.result similarity index 100% rename from mtr/basic/r/mcs225_replace_function.result rename to mysql-test/columnstore/basic/r/mcs225_replace_function.result diff --git a/mtr/basic/r/mcs226_elt_function.result b/mysql-test/columnstore/basic/r/mcs226_elt_function.result similarity index 100% rename from mtr/basic/r/mcs226_elt_function.result rename to mysql-test/columnstore/basic/r/mcs226_elt_function.result diff --git a/mtr/basic/r/mcs227_div_function.result b/mysql-test/columnstore/basic/r/mcs227_div_function.result similarity index 100% rename from mtr/basic/r/mcs227_div_function.result rename to mysql-test/columnstore/basic/r/mcs227_div_function.result diff --git a/mtr/basic/r/mcs228_regexp_operator.result b/mysql-test/columnstore/basic/r/mcs228_regexp_operator.result similarity index 100% rename from mtr/basic/r/mcs228_regexp_operator.result rename to mysql-test/columnstore/basic/r/mcs228_regexp_operator.result diff --git a/mtr/basic/r/mcs229_data_compression_type.result b/mysql-test/columnstore/basic/r/mcs229_data_compression_type.result similarity index 100% rename from mtr/basic/r/mcs229_data_compression_type.result rename to mysql-test/columnstore/basic/r/mcs229_data_compression_type.result diff --git a/mtr/basic/r/mcs22_insert_ignore.result b/mysql-test/columnstore/basic/r/mcs22_insert_ignore.result similarity index 100% rename from mtr/basic/r/mcs22_insert_ignore.result rename to mysql-test/columnstore/basic/r/mcs22_insert_ignore.result diff --git a/mtr/basic/r/mcs230_wide_table_600columns.result b/mysql-test/columnstore/basic/r/mcs230_wide_table_600columns.result similarity index 100% rename from mtr/basic/r/mcs230_wide_table_600columns.result rename to mysql-test/columnstore/basic/r/mcs230_wide_table_600columns.result diff --git a/mtr/basic/r/mcs231_reverse_function.result b/mysql-test/columnstore/basic/r/mcs231_reverse_function.result similarity index 100% rename from mtr/basic/r/mcs231_reverse_function.result rename to mysql-test/columnstore/basic/r/mcs231_reverse_function.result diff --git a/mtr/basic/r/mcs232_second_function.result b/mysql-test/columnstore/basic/r/mcs232_second_function.result similarity index 100% rename from mtr/basic/r/mcs232_second_function.result rename to mysql-test/columnstore/basic/r/mcs232_second_function.result diff --git a/mtr/basic/r/mcs233_sec_to_time_function.result b/mysql-test/columnstore/basic/r/mcs233_sec_to_time_function.result similarity index 100% rename from mtr/basic/r/mcs233_sec_to_time_function.result rename to mysql-test/columnstore/basic/r/mcs233_sec_to_time_function.result diff --git a/mtr/basic/r/mcs234_rpad_function.result b/mysql-test/columnstore/basic/r/mcs234_rpad_function.result similarity index 100% rename from mtr/basic/r/mcs234_rpad_function.result rename to mysql-test/columnstore/basic/r/mcs234_rpad_function.result diff --git a/mtr/basic/r/mcs235_lpad_function.result b/mysql-test/columnstore/basic/r/mcs235_lpad_function.result similarity index 100% rename from mtr/basic/r/mcs235_lpad_function.result rename to mysql-test/columnstore/basic/r/mcs235_lpad_function.result diff --git a/mtr/basic/r/mcs236_extract_function.result b/mysql-test/columnstore/basic/r/mcs236_extract_function.result similarity index 100% rename from mtr/basic/r/mcs236_extract_function.result rename to mysql-test/columnstore/basic/r/mcs236_extract_function.result diff --git a/mtr/basic/r/mcs237_exp_function.result b/mysql-test/columnstore/basic/r/mcs237_exp_function.result similarity index 100% rename from mtr/basic/r/mcs237_exp_function.result rename to mysql-test/columnstore/basic/r/mcs237_exp_function.result diff --git a/mtr/basic/r/mcs238_find_in_set_function.result b/mysql-test/columnstore/basic/r/mcs238_find_in_set_function.result similarity index 100% rename from mtr/basic/r/mcs238_find_in_set_function.result rename to mysql-test/columnstore/basic/r/mcs238_find_in_set_function.result diff --git a/mtr/basic/r/mcs239_format_function.result b/mysql-test/columnstore/basic/r/mcs239_format_function.result similarity index 100% rename from mtr/basic/r/mcs239_format_function.result rename to mysql-test/columnstore/basic/r/mcs239_format_function.result diff --git a/mtr/basic/r/mcs23_replace.result b/mysql-test/columnstore/basic/r/mcs23_replace.result similarity index 100% rename from mtr/basic/r/mcs23_replace.result rename to mysql-test/columnstore/basic/r/mcs23_replace.result diff --git a/mtr/basic/r/mcs240_get_format_function.result b/mysql-test/columnstore/basic/r/mcs240_get_format_function.result similarity index 100% rename from mtr/basic/r/mcs240_get_format_function.result rename to mysql-test/columnstore/basic/r/mcs240_get_format_function.result diff --git a/mtr/basic/r/mcs241_not_regexp_function.result b/mysql-test/columnstore/basic/r/mcs241_not_regexp_function.result similarity index 100% rename from mtr/basic/r/mcs241_not_regexp_function.result rename to mysql-test/columnstore/basic/r/mcs241_not_regexp_function.result diff --git a/mtr/basic/r/mcs242_rlike_function.result b/mysql-test/columnstore/basic/r/mcs242_rlike_function.result similarity index 100% rename from mtr/basic/r/mcs242_rlike_function.result rename to mysql-test/columnstore/basic/r/mcs242_rlike_function.result diff --git a/mtr/basic/r/mcs243_not_rlike_function.result b/mysql-test/columnstore/basic/r/mcs243_not_rlike_function.result similarity index 100% rename from mtr/basic/r/mcs243_not_rlike_function.result rename to mysql-test/columnstore/basic/r/mcs243_not_rlike_function.result diff --git a/mtr/basic/r/mcs244_regexp_instr_function.result b/mysql-test/columnstore/basic/r/mcs244_regexp_instr_function.result similarity index 100% rename from mtr/basic/r/mcs244_regexp_instr_function.result rename to mysql-test/columnstore/basic/r/mcs244_regexp_instr_function.result diff --git a/mtr/basic/r/mcs245_regexp_replace_function.result b/mysql-test/columnstore/basic/r/mcs245_regexp_replace_function.result similarity index 100% rename from mtr/basic/r/mcs245_regexp_replace_function.result rename to mysql-test/columnstore/basic/r/mcs245_regexp_replace_function.result diff --git a/mtr/basic/r/mcs246_regexp_substr_function.result b/mysql-test/columnstore/basic/r/mcs246_regexp_substr_function.result similarity index 100% rename from mtr/basic/r/mcs246_regexp_substr_function.result rename to mysql-test/columnstore/basic/r/mcs246_regexp_substr_function.result diff --git a/mtr/basic/r/mcs247_from_unixtime_funtion.result b/mysql-test/columnstore/basic/r/mcs247_from_unixtime_funtion.result similarity index 100% rename from mtr/basic/r/mcs247_from_unixtime_funtion.result rename to mysql-test/columnstore/basic/r/mcs247_from_unixtime_funtion.result diff --git a/mtr/basic/r/mcs248_from_days_function.result b/mysql-test/columnstore/basic/r/mcs248_from_days_function.result similarity index 100% rename from mtr/basic/r/mcs248_from_days_function.result rename to mysql-test/columnstore/basic/r/mcs248_from_days_function.result diff --git a/mtr/basic/r/mcs249_to_days_function.result b/mysql-test/columnstore/basic/r/mcs249_to_days_function.result similarity index 100% rename from mtr/basic/r/mcs249_to_days_function.result rename to mysql-test/columnstore/basic/r/mcs249_to_days_function.result diff --git a/mtr/basic/r/mcs24_insert_from_another_table.result b/mysql-test/columnstore/basic/r/mcs24_insert_from_another_table.result similarity index 100% rename from mtr/basic/r/mcs24_insert_from_another_table.result rename to mysql-test/columnstore/basic/r/mcs24_insert_from_another_table.result diff --git a/mtr/basic/r/mcs250_to_seconds_function.result b/mysql-test/columnstore/basic/r/mcs250_to_seconds_function.result similarity index 100% rename from mtr/basic/r/mcs250_to_seconds_function.result rename to mysql-test/columnstore/basic/r/mcs250_to_seconds_function.result diff --git a/mtr/basic/r/mcs251_time_to_sec_function.result b/mysql-test/columnstore/basic/r/mcs251_time_to_sec_function.result similarity index 100% rename from mtr/basic/r/mcs251_time_to_sec_function.result rename to mysql-test/columnstore/basic/r/mcs251_time_to_sec_function.result diff --git a/mtr/basic/r/mcs252_time_format_function.result b/mysql-test/columnstore/basic/r/mcs252_time_format_function.result similarity index 100% rename from mtr/basic/r/mcs252_time_format_function.result rename to mysql-test/columnstore/basic/r/mcs252_time_format_function.result diff --git a/mtr/basic/r/mcs253_greatest_function.result b/mysql-test/columnstore/basic/r/mcs253_greatest_function.result similarity index 100% rename from mtr/basic/r/mcs253_greatest_function.result rename to mysql-test/columnstore/basic/r/mcs253_greatest_function.result diff --git a/mtr/basic/r/mcs254_hex_function.result b/mysql-test/columnstore/basic/r/mcs254_hex_function.result similarity index 100% rename from mtr/basic/r/mcs254_hex_function.result rename to mysql-test/columnstore/basic/r/mcs254_hex_function.result diff --git a/mtr/basic/r/mcs255_least_function.result b/mysql-test/columnstore/basic/r/mcs255_least_function.result similarity index 100% rename from mtr/basic/r/mcs255_least_function.result rename to mysql-test/columnstore/basic/r/mcs255_least_function.result diff --git a/mtr/basic/r/mcs256_locate_function.result b/mysql-test/columnstore/basic/r/mcs256_locate_function.result similarity index 100% rename from mtr/basic/r/mcs256_locate_function.result rename to mysql-test/columnstore/basic/r/mcs256_locate_function.result diff --git a/mtr/basic/r/mcs257_maketime_function.result b/mysql-test/columnstore/basic/r/mcs257_maketime_function.result similarity index 100% rename from mtr/basic/r/mcs257_maketime_function.result rename to mysql-test/columnstore/basic/r/mcs257_maketime_function.result diff --git a/mtr/basic/r/mcs258_monthname_function.result b/mysql-test/columnstore/basic/r/mcs258_monthname_function.result similarity index 100% rename from mtr/basic/r/mcs258_monthname_function.result rename to mysql-test/columnstore/basic/r/mcs258_monthname_function.result diff --git a/mtr/basic/r/mcs259_instr_function.result b/mysql-test/columnstore/basic/r/mcs259_instr_function.result similarity index 100% rename from mtr/basic/r/mcs259_instr_function.result rename to mysql-test/columnstore/basic/r/mcs259_instr_function.result diff --git a/mtr/basic/r/mcs25_insert_delayed.result b/mysql-test/columnstore/basic/r/mcs25_insert_delayed.result similarity index 100% rename from mtr/basic/r/mcs25_insert_delayed.result rename to mysql-test/columnstore/basic/r/mcs25_insert_delayed.result diff --git a/mtr/basic/r/mcs260_space_function.result b/mysql-test/columnstore/basic/r/mcs260_space_function.result similarity index 100% rename from mtr/basic/r/mcs260_space_function.result rename to mysql-test/columnstore/basic/r/mcs260_space_function.result diff --git a/mtr/basic/r/mcs261_sha_function.result b/mysql-test/columnstore/basic/r/mcs261_sha_function.result similarity index 100% rename from mtr/basic/r/mcs261_sha_function.result rename to mysql-test/columnstore/basic/r/mcs261_sha_function.result diff --git a/mtr/basic/r/mcs262_sha1_function.result b/mysql-test/columnstore/basic/r/mcs262_sha1_function.result similarity index 100% rename from mtr/basic/r/mcs262_sha1_function.result rename to mysql-test/columnstore/basic/r/mcs262_sha1_function.result diff --git a/mtr/basic/r/mcs263_sin_function.result b/mysql-test/columnstore/basic/r/mcs263_sin_function.result similarity index 100% rename from mtr/basic/r/mcs263_sin_function.result rename to mysql-test/columnstore/basic/r/mcs263_sin_function.result diff --git a/mtr/basic/r/mcs264_subdate_function.result b/mysql-test/columnstore/basic/r/mcs264_subdate_function.result similarity index 100% rename from mtr/basic/r/mcs264_subdate_function.result rename to mysql-test/columnstore/basic/r/mcs264_subdate_function.result diff --git a/mtr/basic/r/mcs265_subtime_function.result b/mysql-test/columnstore/basic/r/mcs265_subtime_function.result similarity index 100% rename from mtr/basic/r/mcs265_subtime_function.result rename to mysql-test/columnstore/basic/r/mcs265_subtime_function.result diff --git a/mtr/basic/r/mcs266_str_to_date_function.result b/mysql-test/columnstore/basic/r/mcs266_str_to_date_function.result similarity index 100% rename from mtr/basic/r/mcs266_str_to_date_function.result rename to mysql-test/columnstore/basic/r/mcs266_str_to_date_function.result diff --git a/mtr/basic/r/mcs267_sha2_function.result b/mysql-test/columnstore/basic/r/mcs267_sha2_function.result similarity index 100% rename from mtr/basic/r/mcs267_sha2_function.result rename to mysql-test/columnstore/basic/r/mcs267_sha2_function.result diff --git a/mtr/basic/r/mcs268_compress_function.result b/mysql-test/columnstore/basic/r/mcs268_compress_function.result similarity index 100% rename from mtr/basic/r/mcs268_compress_function.result rename to mysql-test/columnstore/basic/r/mcs268_compress_function.result diff --git a/mtr/basic/r/mcs269_uncompress_function.result b/mysql-test/columnstore/basic/r/mcs269_uncompress_function.result similarity index 100% rename from mtr/basic/r/mcs269_uncompress_function.result rename to mysql-test/columnstore/basic/r/mcs269_uncompress_function.result diff --git a/mtr/basic/r/mcs26_insert_into_view.result b/mysql-test/columnstore/basic/r/mcs26_insert_into_view.result similarity index 100% rename from mtr/basic/r/mcs26_insert_into_view.result rename to mysql-test/columnstore/basic/r/mcs26_insert_into_view.result diff --git a/mtr/basic/r/mcs270_uncompressed_length_function.result b/mysql-test/columnstore/basic/r/mcs270_uncompressed_length_function.result similarity index 100% rename from mtr/basic/r/mcs270_uncompressed_length_function.result rename to mysql-test/columnstore/basic/r/mcs270_uncompressed_length_function.result diff --git a/mtr/basic/r/mcs271_substring_index_function.result b/mysql-test/columnstore/basic/r/mcs271_substring_index_function.result similarity index 100% rename from mtr/basic/r/mcs271_substring_index_function.result rename to mysql-test/columnstore/basic/r/mcs271_substring_index_function.result diff --git a/mtr/basic/r/mcs272_substring_function.result b/mysql-test/columnstore/basic/r/mcs272_substring_function.result similarity index 100% rename from mtr/basic/r/mcs272_substring_function.result rename to mysql-test/columnstore/basic/r/mcs272_substring_function.result diff --git a/mtr/basic/r/mcs273_substr_function.result b/mysql-test/columnstore/basic/r/mcs273_substr_function.result similarity index 100% rename from mtr/basic/r/mcs273_substr_function.result rename to mysql-test/columnstore/basic/r/mcs273_substr_function.result diff --git a/mtr/basic/r/mcs274_time_function.result b/mysql-test/columnstore/basic/r/mcs274_time_function.result similarity index 100% rename from mtr/basic/r/mcs274_time_function.result rename to mysql-test/columnstore/basic/r/mcs274_time_function.result diff --git a/mtr/basic/r/mcs275_timediff_function.result b/mysql-test/columnstore/basic/r/mcs275_timediff_function.result similarity index 100% rename from mtr/basic/r/mcs275_timediff_function.result rename to mysql-test/columnstore/basic/r/mcs275_timediff_function.result diff --git a/mtr/basic/r/mcs276_timestampdiff_function.result b/mysql-test/columnstore/basic/r/mcs276_timestampdiff_function.result similarity index 100% rename from mtr/basic/r/mcs276_timestampdiff_function.result rename to mysql-test/columnstore/basic/r/mcs276_timestampdiff_function.result diff --git a/mtr/basic/r/mcs277_timestampadd_function.result b/mysql-test/columnstore/basic/r/mcs277_timestampadd_function.result similarity index 100% rename from mtr/basic/r/mcs277_timestampadd_function.result rename to mysql-test/columnstore/basic/r/mcs277_timestampadd_function.result diff --git a/mtr/basic/r/mcs278_weekday_function.result b/mysql-test/columnstore/basic/r/mcs278_weekday_function.result similarity index 100% rename from mtr/basic/r/mcs278_weekday_function.result rename to mysql-test/columnstore/basic/r/mcs278_weekday_function.result diff --git a/mtr/basic/r/mcs279_week_function.result b/mysql-test/columnstore/basic/r/mcs279_week_function.result similarity index 100% rename from mtr/basic/r/mcs279_week_function.result rename to mysql-test/columnstore/basic/r/mcs279_week_function.result diff --git a/mtr/basic/r/mcs27_insert_on_duplicate_update.result b/mysql-test/columnstore/basic/r/mcs27_insert_on_duplicate_update.result similarity index 100% rename from mtr/basic/r/mcs27_insert_on_duplicate_update.result rename to mysql-test/columnstore/basic/r/mcs27_insert_on_duplicate_update.result diff --git a/mtr/basic/r/mcs280_weekofyear_function.result b/mysql-test/columnstore/basic/r/mcs280_weekofyear_function.result similarity index 100% rename from mtr/basic/r/mcs280_weekofyear_function.result rename to mysql-test/columnstore/basic/r/mcs280_weekofyear_function.result diff --git a/mtr/basic/r/mcs281_year_function.result b/mysql-test/columnstore/basic/r/mcs281_year_function.result similarity index 100% rename from mtr/basic/r/mcs281_year_function.result rename to mysql-test/columnstore/basic/r/mcs281_year_function.result diff --git a/mtr/basic/r/mcs282_yearweek_function.result b/mysql-test/columnstore/basic/r/mcs282_yearweek_function.result similarity index 100% rename from mtr/basic/r/mcs282_yearweek_function.result rename to mysql-test/columnstore/basic/r/mcs282_yearweek_function.result diff --git a/mtr/basic/r/mcs283_last_day_function.result b/mysql-test/columnstore/basic/r/mcs283_last_day_function.result similarity index 100% rename from mtr/basic/r/mcs283_last_day_function.result rename to mysql-test/columnstore/basic/r/mcs283_last_day_function.result diff --git a/mtr/basic/r/mcs284_hour_function.result b/mysql-test/columnstore/basic/r/mcs284_hour_function.result similarity index 100% rename from mtr/basic/r/mcs284_hour_function.result rename to mysql-test/columnstore/basic/r/mcs284_hour_function.result diff --git a/mtr/basic/r/mcs285_right_function.result b/mysql-test/columnstore/basic/r/mcs285_right_function.result similarity index 100% rename from mtr/basic/r/mcs285_right_function.result rename to mysql-test/columnstore/basic/r/mcs285_right_function.result diff --git a/mtr/basic/r/mcs286_left_function.result b/mysql-test/columnstore/basic/r/mcs286_left_function.result similarity index 100% rename from mtr/basic/r/mcs286_left_function.result rename to mysql-test/columnstore/basic/r/mcs286_left_function.result diff --git a/mtr/basic/r/mcs28_load_data_local_infile.result b/mysql-test/columnstore/basic/r/mcs28_load_data_local_infile.result similarity index 100% rename from mtr/basic/r/mcs28_load_data_local_infile.result rename to mysql-test/columnstore/basic/r/mcs28_load_data_local_infile.result diff --git a/mtr/basic/r/mcs29_load_data_local_infile_negative.result b/mysql-test/columnstore/basic/r/mcs29_load_data_local_infile_negative.result similarity index 100% rename from mtr/basic/r/mcs29_load_data_local_infile_negative.result rename to mysql-test/columnstore/basic/r/mcs29_load_data_local_infile_negative.result diff --git a/mtr/basic/r/mcs2_create_table_valid_names.result b/mysql-test/columnstore/basic/r/mcs2_create_table_valid_names.result similarity index 100% rename from mtr/basic/r/mcs2_create_table_valid_names.result rename to mysql-test/columnstore/basic/r/mcs2_create_table_valid_names.result diff --git a/mtr/basic/r/mcs30_update_table.result b/mysql-test/columnstore/basic/r/mcs30_update_table.result similarity index 100% rename from mtr/basic/r/mcs30_update_table.result rename to mysql-test/columnstore/basic/r/mcs30_update_table.result diff --git a/mtr/basic/r/mcs31_update_table_negative.result b/mysql-test/columnstore/basic/r/mcs31_update_table_negative.result similarity index 100% rename from mtr/basic/r/mcs31_update_table_negative.result rename to mysql-test/columnstore/basic/r/mcs31_update_table_negative.result diff --git a/mtr/basic/r/mcs32_delete_table.result b/mysql-test/columnstore/basic/r/mcs32_delete_table.result similarity index 100% rename from mtr/basic/r/mcs32_delete_table.result rename to mysql-test/columnstore/basic/r/mcs32_delete_table.result diff --git a/mtr/basic/r/mcs33_select_basic.result b/mysql-test/columnstore/basic/r/mcs33_select_basic.result similarity index 100% rename from mtr/basic/r/mcs33_select_basic.result rename to mysql-test/columnstore/basic/r/mcs33_select_basic.result diff --git a/mtr/basic/r/mcs34_select_order_by.result b/mysql-test/columnstore/basic/r/mcs34_select_order_by.result similarity index 100% rename from mtr/basic/r/mcs34_select_order_by.result rename to mysql-test/columnstore/basic/r/mcs34_select_order_by.result diff --git a/mtr/basic/r/mcs35_select_group_by.result b/mysql-test/columnstore/basic/r/mcs35_select_group_by.result similarity index 100% rename from mtr/basic/r/mcs35_select_group_by.result rename to mysql-test/columnstore/basic/r/mcs35_select_group_by.result diff --git a/mtr/basic/r/mcs36_select_order_by_group_by.result b/mysql-test/columnstore/basic/r/mcs36_select_order_by_group_by.result similarity index 100% rename from mtr/basic/r/mcs36_select_order_by_group_by.result rename to mysql-test/columnstore/basic/r/mcs36_select_order_by_group_by.result diff --git a/mtr/basic/r/mcs37_select_distinct.result b/mysql-test/columnstore/basic/r/mcs37_select_distinct.result similarity index 100% rename from mtr/basic/r/mcs37_select_distinct.result rename to mysql-test/columnstore/basic/r/mcs37_select_distinct.result diff --git a/mtr/basic/r/mcs38_select_limit.result b/mysql-test/columnstore/basic/r/mcs38_select_limit.result similarity index 100% rename from mtr/basic/r/mcs38_select_limit.result rename to mysql-test/columnstore/basic/r/mcs38_select_limit.result diff --git a/mtr/basic/r/mcs39_select_function_calls.result b/mysql-test/columnstore/basic/r/mcs39_select_function_calls.result similarity index 100% rename from mtr/basic/r/mcs39_select_function_calls.result rename to mysql-test/columnstore/basic/r/mcs39_select_function_calls.result diff --git a/mtr/basic/r/mcs3_create_table_charset_collations.result b/mysql-test/columnstore/basic/r/mcs3_create_table_charset_collations.result similarity index 100% rename from mtr/basic/r/mcs3_create_table_charset_collations.result rename to mysql-test/columnstore/basic/r/mcs3_create_table_charset_collations.result diff --git a/mtr/basic/r/mcs40_select_expressions.result b/mysql-test/columnstore/basic/r/mcs40_select_expressions.result similarity index 100% rename from mtr/basic/r/mcs40_select_expressions.result rename to mysql-test/columnstore/basic/r/mcs40_select_expressions.result diff --git a/mtr/basic/r/mcs41_select_joins.result b/mysql-test/columnstore/basic/r/mcs41_select_joins.result similarity index 100% rename from mtr/basic/r/mcs41_select_joins.result rename to mysql-test/columnstore/basic/r/mcs41_select_joins.result diff --git a/mtr/basic/r/mcs42_select_precision.result b/mysql-test/columnstore/basic/r/mcs42_select_precision.result similarity index 100% rename from mtr/basic/r/mcs42_select_precision.result rename to mysql-test/columnstore/basic/r/mcs42_select_precision.result diff --git a/mtr/basic/r/mcs44_select_crossengine_join.result b/mysql-test/columnstore/basic/r/mcs44_select_crossengine_join.result similarity index 100% rename from mtr/basic/r/mcs44_select_crossengine_join.result rename to mysql-test/columnstore/basic/r/mcs44_select_crossengine_join.result diff --git a/mtr/basic/r/mcs45_write_crossengine_join.result b/mysql-test/columnstore/basic/r/mcs45_write_crossengine_join.result similarity index 100% rename from mtr/basic/r/mcs45_write_crossengine_join.result rename to mysql-test/columnstore/basic/r/mcs45_write_crossengine_join.result diff --git a/mtr/basic/r/mcs47_cpimport_central_loc_sin_source.result b/mysql-test/columnstore/basic/r/mcs47_cpimport_central_loc_sin_source.result similarity index 100% rename from mtr/basic/r/mcs47_cpimport_central_loc_sin_source.result rename to mysql-test/columnstore/basic/r/mcs47_cpimport_central_loc_sin_source.result diff --git a/mtr/basic/r/mcs48_cpimport_central_loc_dist_source.result b/mysql-test/columnstore/basic/r/mcs48_cpimport_central_loc_dist_source.result similarity index 100% rename from mtr/basic/r/mcs48_cpimport_central_loc_dist_source.result rename to mysql-test/columnstore/basic/r/mcs48_cpimport_central_loc_dist_source.result diff --git a/mtr/basic/r/mcs49_cpimport_parallel_dist.result b/mysql-test/columnstore/basic/r/mcs49_cpimport_parallel_dist.result similarity index 100% rename from mtr/basic/r/mcs49_cpimport_parallel_dist.result rename to mysql-test/columnstore/basic/r/mcs49_cpimport_parallel_dist.result diff --git a/mtr/basic/r/mcs4_create_table_defined_values.result b/mysql-test/columnstore/basic/r/mcs4_create_table_defined_values.result similarity index 100% rename from mtr/basic/r/mcs4_create_table_defined_values.result rename to mysql-test/columnstore/basic/r/mcs4_create_table_defined_values.result diff --git a/mtr/basic/r/mcs50_cpimport_stdin.result b/mysql-test/columnstore/basic/r/mcs50_cpimport_stdin.result similarity index 100% rename from mtr/basic/r/mcs50_cpimport_stdin.result rename to mysql-test/columnstore/basic/r/mcs50_cpimport_stdin.result diff --git a/mtr/basic/r/mcs51_cpimport_select_from.result b/mysql-test/columnstore/basic/r/mcs51_cpimport_select_from.result similarity index 100% rename from mtr/basic/r/mcs51_cpimport_select_from.result rename to mysql-test/columnstore/basic/r/mcs51_cpimport_select_from.result diff --git a/mtr/basic/r/mcs55_cpimport_binary_source.result b/mysql-test/columnstore/basic/r/mcs55_cpimport_binary_source.result similarity index 100% rename from mtr/basic/r/mcs55_cpimport_binary_source.result rename to mysql-test/columnstore/basic/r/mcs55_cpimport_binary_source.result diff --git a/mtr/basic/r/mcs56_cpimport_negative.result b/mysql-test/columnstore/basic/r/mcs56_cpimport_negative.result similarity index 100% rename from mtr/basic/r/mcs56_cpimport_negative.result rename to mysql-test/columnstore/basic/r/mcs56_cpimport_negative.result diff --git a/mtr/basic/r/mcs57_autoincrement.result b/mysql-test/columnstore/basic/r/mcs57_autoincrement.result similarity index 100% rename from mtr/basic/r/mcs57_autoincrement.result rename to mysql-test/columnstore/basic/r/mcs57_autoincrement.result diff --git a/mtr/basic/r/mcs59_nonscalar_datatypes.result b/mysql-test/columnstore/basic/r/mcs59_nonscalar_datatypes.result similarity index 100% rename from mtr/basic/r/mcs59_nonscalar_datatypes.result rename to mysql-test/columnstore/basic/r/mcs59_nonscalar_datatypes.result diff --git a/mtr/basic/r/mcs5_create_table_from_other_tables.result b/mysql-test/columnstore/basic/r/mcs5_create_table_from_other_tables.result similarity index 100% rename from mtr/basic/r/mcs5_create_table_from_other_tables.result rename to mysql-test/columnstore/basic/r/mcs5_create_table_from_other_tables.result diff --git a/mtr/basic/r/mcs60_trigger.result b/mysql-test/columnstore/basic/r/mcs60_trigger.result similarity index 100% rename from mtr/basic/r/mcs60_trigger.result rename to mysql-test/columnstore/basic/r/mcs60_trigger.result diff --git a/mtr/basic/r/mcs62_binary_datatypes.result b/mysql-test/columnstore/basic/r/mcs62_binary_datatypes.result similarity index 100% rename from mtr/basic/r/mcs62_binary_datatypes.result rename to mysql-test/columnstore/basic/r/mcs62_binary_datatypes.result diff --git a/mtr/basic/r/mcs63_crossengine_views.result b/mysql-test/columnstore/basic/r/mcs63_crossengine_views.result similarity index 100% rename from mtr/basic/r/mcs63_crossengine_views.result rename to mysql-test/columnstore/basic/r/mcs63_crossengine_views.result diff --git a/mtr/basic/r/mcs64_crossengine_group_by.result b/mysql-test/columnstore/basic/r/mcs64_crossengine_group_by.result similarity index 100% rename from mtr/basic/r/mcs64_crossengine_group_by.result rename to mysql-test/columnstore/basic/r/mcs64_crossengine_group_by.result diff --git a/mtr/basic/r/mcs65_crossengine_order_by.result b/mysql-test/columnstore/basic/r/mcs65_crossengine_order_by.result similarity index 100% rename from mtr/basic/r/mcs65_crossengine_order_by.result rename to mysql-test/columnstore/basic/r/mcs65_crossengine_order_by.result diff --git a/mtr/basic/r/mcs67_ldi_datafile_separators.result b/mysql-test/columnstore/basic/r/mcs67_ldi_datafile_separators.result similarity index 100% rename from mtr/basic/r/mcs67_ldi_datafile_separators.result rename to mysql-test/columnstore/basic/r/mcs67_ldi_datafile_separators.result diff --git a/mtr/basic/r/mcs68_cpimport_datafile_separators.result b/mysql-test/columnstore/basic/r/mcs68_cpimport_datafile_separators.result similarity index 100% rename from mtr/basic/r/mcs68_cpimport_datafile_separators.result rename to mysql-test/columnstore/basic/r/mcs68_cpimport_datafile_separators.result diff --git a/mtr/basic/r/mcs69_cast_data_types.result b/mysql-test/columnstore/basic/r/mcs69_cast_data_types.result similarity index 100% rename from mtr/basic/r/mcs69_cast_data_types.result rename to mysql-test/columnstore/basic/r/mcs69_cast_data_types.result diff --git a/mtr/basic/r/mcs70_cast_date_time.result b/mysql-test/columnstore/basic/r/mcs70_cast_date_time.result similarity index 100% rename from mtr/basic/r/mcs70_cast_date_time.result rename to mysql-test/columnstore/basic/r/mcs70_cast_date_time.result diff --git a/mtr/basic/r/mcs71_crossengine_where_groupby_orderby_limit.result b/mysql-test/columnstore/basic/r/mcs71_crossengine_where_groupby_orderby_limit.result similarity index 100% rename from mtr/basic/r/mcs71_crossengine_where_groupby_orderby_limit.result rename to mysql-test/columnstore/basic/r/mcs71_crossengine_where_groupby_orderby_limit.result diff --git a/mtr/basic/r/mcs73_indexes_keys.result b/mysql-test/columnstore/basic/r/mcs73_indexes_keys.result similarity index 100% rename from mtr/basic/r/mcs73_indexes_keys.result rename to mysql-test/columnstore/basic/r/mcs73_indexes_keys.result diff --git a/mtr/basic/r/mcs74_check_constraint.result b/mysql-test/columnstore/basic/r/mcs74_check_constraint.result similarity index 100% rename from mtr/basic/r/mcs74_check_constraint.result rename to mysql-test/columnstore/basic/r/mcs74_check_constraint.result diff --git a/mtr/basic/r/mcs75_generated_columns.result b/mysql-test/columnstore/basic/r/mcs75_generated_columns.result similarity index 100% rename from mtr/basic/r/mcs75_generated_columns.result rename to mysql-test/columnstore/basic/r/mcs75_generated_columns.result diff --git a/mtr/basic/r/mcs76_having.result b/mysql-test/columnstore/basic/r/mcs76_having.result similarity index 100% rename from mtr/basic/r/mcs76_having.result rename to mysql-test/columnstore/basic/r/mcs76_having.result diff --git a/mtr/basic/r/mcs77_where_conditions.result b/mysql-test/columnstore/basic/r/mcs77_where_conditions.result similarity index 100% rename from mtr/basic/r/mcs77_where_conditions.result rename to mysql-test/columnstore/basic/r/mcs77_where_conditions.result diff --git a/mtr/basic/r/mcs78_aliases.result b/mysql-test/columnstore/basic/r/mcs78_aliases.result similarity index 100% rename from mtr/basic/r/mcs78_aliases.result rename to mysql-test/columnstore/basic/r/mcs78_aliases.result diff --git a/mtr/basic/r/mcs79_exists.result b/mysql-test/columnstore/basic/r/mcs79_exists.result similarity index 100% rename from mtr/basic/r/mcs79_exists.result rename to mysql-test/columnstore/basic/r/mcs79_exists.result diff --git a/mtr/basic/r/mcs7_create_table_with_metadata.result b/mysql-test/columnstore/basic/r/mcs7_create_table_with_metadata.result similarity index 100% rename from mtr/basic/r/mcs7_create_table_with_metadata.result rename to mysql-test/columnstore/basic/r/mcs7_create_table_with_metadata.result diff --git a/mtr/basic/r/mcs80_set_operations.result b/mysql-test/columnstore/basic/r/mcs80_set_operations.result similarity index 100% rename from mtr/basic/r/mcs80_set_operations.result rename to mysql-test/columnstore/basic/r/mcs80_set_operations.result diff --git a/mtr/basic/r/mcs81_self_join.result b/mysql-test/columnstore/basic/r/mcs81_self_join.result similarity index 100% rename from mtr/basic/r/mcs81_self_join.result rename to mysql-test/columnstore/basic/r/mcs81_self_join.result diff --git a/mtr/basic/r/mcs82_update_join.result b/mysql-test/columnstore/basic/r/mcs82_update_join.result similarity index 100% rename from mtr/basic/r/mcs82_update_join.result rename to mysql-test/columnstore/basic/r/mcs82_update_join.result diff --git a/mtr/basic/r/mcs83_delete_join.result b/mysql-test/columnstore/basic/r/mcs83_delete_join.result similarity index 100% rename from mtr/basic/r/mcs83_delete_join.result rename to mysql-test/columnstore/basic/r/mcs83_delete_join.result diff --git a/mtr/basic/r/mcs84_rollup.result b/mysql-test/columnstore/basic/r/mcs84_rollup.result similarity index 100% rename from mtr/basic/r/mcs84_rollup.result rename to mysql-test/columnstore/basic/r/mcs84_rollup.result diff --git a/mtr/basic/r/mcs85_derived_table.result b/mysql-test/columnstore/basic/r/mcs85_derived_table.result similarity index 100% rename from mtr/basic/r/mcs85_derived_table.result rename to mysql-test/columnstore/basic/r/mcs85_derived_table.result diff --git a/mtr/basic/r/mcs87_alter_column.result b/mysql-test/columnstore/basic/r/mcs87_alter_column.result similarity index 100% rename from mtr/basic/r/mcs87_alter_column.result rename to mysql-test/columnstore/basic/r/mcs87_alter_column.result diff --git a/mtr/basic/r/mcs88_import_export_csv.result b/mysql-test/columnstore/basic/r/mcs88_import_export_csv.result similarity index 100% rename from mtr/basic/r/mcs88_import_export_csv.result rename to mysql-test/columnstore/basic/r/mcs88_import_export_csv.result diff --git a/mtr/basic/r/mcs89_drop_table_restrict.result b/mysql-test/columnstore/basic/r/mcs89_drop_table_restrict.result similarity index 100% rename from mtr/basic/r/mcs89_drop_table_restrict.result rename to mysql-test/columnstore/basic/r/mcs89_drop_table_restrict.result diff --git a/mtr/basic/r/mcs8_create_table_with_constraints.result b/mysql-test/columnstore/basic/r/mcs8_create_table_with_constraints.result similarity index 100% rename from mtr/basic/r/mcs8_create_table_with_constraints.result rename to mysql-test/columnstore/basic/r/mcs8_create_table_with_constraints.result diff --git a/mtr/basic/r/mcs90_aggregate_functions.result b/mysql-test/columnstore/basic/r/mcs90_aggregate_functions.result similarity index 100% rename from mtr/basic/r/mcs90_aggregate_functions.result rename to mysql-test/columnstore/basic/r/mcs90_aggregate_functions.result diff --git a/mtr/basic/r/mcs91_comparison_functions.result b/mysql-test/columnstore/basic/r/mcs91_comparison_functions.result similarity index 100% rename from mtr/basic/r/mcs91_comparison_functions.result rename to mysql-test/columnstore/basic/r/mcs91_comparison_functions.result diff --git a/mtr/basic/r/mcs92_date_functions.result b/mysql-test/columnstore/basic/r/mcs92_date_functions.result similarity index 100% rename from mtr/basic/r/mcs92_date_functions.result rename to mysql-test/columnstore/basic/r/mcs92_date_functions.result diff --git a/mtr/basic/r/mcs93_string_functions.result b/mysql-test/columnstore/basic/r/mcs93_string_functions.result similarity index 100% rename from mtr/basic/r/mcs93_string_functions.result rename to mysql-test/columnstore/basic/r/mcs93_string_functions.result diff --git a/mtr/basic/r/mcs94_math_functions.result b/mysql-test/columnstore/basic/r/mcs94_math_functions.result similarity index 100% rename from mtr/basic/r/mcs94_math_functions.result rename to mysql-test/columnstore/basic/r/mcs94_math_functions.result diff --git a/mtr/basic/r/mcs95_variance_functions.result b/mysql-test/columnstore/basic/r/mcs95_variance_functions.result similarity index 100% rename from mtr/basic/r/mcs95_variance_functions.result rename to mysql-test/columnstore/basic/r/mcs95_variance_functions.result diff --git a/mtr/basic/r/mcs96_std_deviation_functions.result b/mysql-test/columnstore/basic/r/mcs96_std_deviation_functions.result similarity index 100% rename from mtr/basic/r/mcs96_std_deviation_functions.result rename to mysql-test/columnstore/basic/r/mcs96_std_deviation_functions.result diff --git a/mtr/basic/r/mcs97_group_concat.result b/mysql-test/columnstore/basic/r/mcs97_group_concat.result similarity index 100% rename from mtr/basic/r/mcs97_group_concat.result rename to mysql-test/columnstore/basic/r/mcs97_group_concat.result diff --git a/mtr/basic/r/mcs9_create_table_negative.result b/mysql-test/columnstore/basic/r/mcs9_create_table_negative.result similarity index 100% rename from mtr/basic/r/mcs9_create_table_negative.result rename to mysql-test/columnstore/basic/r/mcs9_create_table_negative.result diff --git a/mtr/basic/r/type_decimal.result b/mysql-test/columnstore/basic/r/type_decimal.result similarity index 100% rename from mtr/basic/r/type_decimal.result rename to mysql-test/columnstore/basic/r/type_decimal.result diff --git a/mtr/basic/r/type_uint64.result b/mysql-test/columnstore/basic/r/type_uint64.result similarity index 100% rename from mtr/basic/r/type_uint64.result rename to mysql-test/columnstore/basic/r/type_uint64.result diff --git a/mtr/basic/r/udf_calshowpartitions.result b/mysql-test/columnstore/basic/r/udf_calshowpartitions.result similarity index 100% rename from mtr/basic/r/udf_calshowpartitions.result rename to mysql-test/columnstore/basic/r/udf_calshowpartitions.result diff --git a/mtr/basic/r/unsigned_aggregate.result b/mysql-test/columnstore/basic/r/unsigned_aggregate.result similarity index 100% rename from mtr/basic/r/unsigned_aggregate.result rename to mysql-test/columnstore/basic/r/unsigned_aggregate.result diff --git a/mtr/basic/r/unsigned_basic.result b/mysql-test/columnstore/basic/r/unsigned_basic.result similarity index 100% rename from mtr/basic/r/unsigned_basic.result rename to mysql-test/columnstore/basic/r/unsigned_basic.result diff --git a/mtr/basic/r/unsigned_bitop.result b/mysql-test/columnstore/basic/r/unsigned_bitop.result similarity index 100% rename from mtr/basic/r/unsigned_bitop.result rename to mysql-test/columnstore/basic/r/unsigned_bitop.result diff --git a/mtr/basic/r/unsigned_bug5628.result b/mysql-test/columnstore/basic/r/unsigned_bug5628.result similarity index 100% rename from mtr/basic/r/unsigned_bug5628.result rename to mysql-test/columnstore/basic/r/unsigned_bug5628.result diff --git a/mtr/basic/r/unsigned_bug5712.result b/mysql-test/columnstore/basic/r/unsigned_bug5712.result similarity index 100% rename from mtr/basic/r/unsigned_bug5712.result rename to mysql-test/columnstore/basic/r/unsigned_bug5712.result diff --git a/mtr/basic/r/unsigned_greatest.result b/mysql-test/columnstore/basic/r/unsigned_greatest.result similarity index 100% rename from mtr/basic/r/unsigned_greatest.result rename to mysql-test/columnstore/basic/r/unsigned_greatest.result diff --git a/mtr/basic/r/unsigned_joins.result b/mysql-test/columnstore/basic/r/unsigned_joins.result similarity index 100% rename from mtr/basic/r/unsigned_joins.result rename to mysql-test/columnstore/basic/r/unsigned_joins.result diff --git a/mtr/basic/r/unsigned_least.result b/mysql-test/columnstore/basic/r/unsigned_least.result similarity index 100% rename from mtr/basic/r/unsigned_least.result rename to mysql-test/columnstore/basic/r/unsigned_least.result diff --git a/mtr/basic/r/unsigned_math.result b/mysql-test/columnstore/basic/r/unsigned_math.result similarity index 100% rename from mtr/basic/r/unsigned_math.result rename to mysql-test/columnstore/basic/r/unsigned_math.result diff --git a/mtr/basic/suite.opt b/mysql-test/columnstore/basic/suite.opt similarity index 100% rename from mtr/basic/suite.opt rename to mysql-test/columnstore/basic/suite.opt diff --git a/mtr/basic/t/ctype_cmp_char4_latin1_bin.test b/mysql-test/columnstore/basic/t/ctype_cmp_char4_latin1_bin.test similarity index 100% rename from mtr/basic/t/ctype_cmp_char4_latin1_bin.test rename to mysql-test/columnstore/basic/t/ctype_cmp_char4_latin1_bin.test diff --git a/mtr/basic/t/ctype_cmp_char4_latin1_swedish_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_char4_latin1_swedish_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_char4_latin1_swedish_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_char4_latin1_swedish_ci.test diff --git a/mtr/basic/t/ctype_cmp_char5_latin1_swedish_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_char5_latin1_swedish_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_char5_latin1_swedish_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_char5_latin1_swedish_ci.test diff --git a/mtr/basic/t/ctype_cmp_combinations.combinations b/mysql-test/columnstore/basic/t/ctype_cmp_combinations.combinations similarity index 100% rename from mtr/basic/t/ctype_cmp_combinations.combinations rename to mysql-test/columnstore/basic/t/ctype_cmp_combinations.combinations diff --git a/mtr/basic/t/ctype_cmp_combinations.inc b/mysql-test/columnstore/basic/t/ctype_cmp_combinations.inc similarity index 100% rename from mtr/basic/t/ctype_cmp_combinations.inc rename to mysql-test/columnstore/basic/t/ctype_cmp_combinations.inc diff --git a/mtr/basic/t/ctype_cmp_create.inc b/mysql-test/columnstore/basic/t/ctype_cmp_create.inc similarity index 100% rename from mtr/basic/t/ctype_cmp_create.inc rename to mysql-test/columnstore/basic/t/ctype_cmp_create.inc diff --git a/mtr/basic/t/ctype_cmp_drop.inc b/mysql-test/columnstore/basic/t/ctype_cmp_drop.inc similarity index 100% rename from mtr/basic/t/ctype_cmp_drop.inc rename to mysql-test/columnstore/basic/t/ctype_cmp_drop.inc diff --git a/mtr/basic/t/ctype_cmp_varchar32_latin1_bin.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_latin1_bin.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_latin1_bin.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_latin1_bin.test diff --git a/mtr/basic/t/ctype_cmp_varchar32_latin1_nopad_bin.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_latin1_nopad_bin.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_latin1_nopad_bin.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_latin1_nopad_bin.test diff --git a/mtr/basic/t/ctype_cmp_varchar32_latin1_swedish_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_latin1_swedish_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_latin1_swedish_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_latin1_swedish_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar32_latin1_swedish_nopad_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_latin1_swedish_nopad_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_latin1_swedish_nopad_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_latin1_swedish_nopad_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar32_utf8_bin.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_bin.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_utf8_bin.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_bin.test diff --git a/mtr/basic/t/ctype_cmp_varchar32_utf8_general_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_general_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_utf8_general_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_general_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar32_utf8_general_nopad_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_general_nopad_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_utf8_general_nopad_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_general_nopad_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar32_utf8_nopad_bin.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_nopad_bin.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_utf8_nopad_bin.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_nopad_bin.test diff --git a/mtr/basic/t/ctype_cmp_varchar32_utf8_unicode_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_unicode_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_utf8_unicode_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_unicode_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar32_utf8_unicode_nopad_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_unicode_nopad_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar32_utf8_unicode_nopad_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar32_utf8_unicode_nopad_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_latin1_bin.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_latin1_bin.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_latin1_bin.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_latin1_bin.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_latin1_nopad_bin.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_latin1_nopad_bin.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_latin1_nopad_bin.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_latin1_nopad_bin.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_latin1_swedish_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_latin1_swedish_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_latin1_swedish_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_latin1_swedish_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_latin1_swedish_nopad_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_latin1_swedish_nopad_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_latin1_swedish_nopad_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_latin1_swedish_nopad_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_utf8_bin.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_bin.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_utf8_bin.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_bin.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_utf8_general_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_general_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_utf8_general_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_general_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_utf8_general_nopad_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_general_nopad_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_utf8_general_nopad_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_general_nopad_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_utf8_nopad_bin.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_nopad_bin.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_utf8_nopad_bin.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_nopad_bin.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_utf8_unicode_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_unicode_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_utf8_unicode_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_unicode_ci.test diff --git a/mtr/basic/t/ctype_cmp_varchar4_utf8_unicode_nopad_ci.test b/mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_unicode_nopad_ci.test similarity index 100% rename from mtr/basic/t/ctype_cmp_varchar4_utf8_unicode_nopad_ci.test rename to mysql-test/columnstore/basic/t/ctype_cmp_varchar4_utf8_unicode_nopad_ci.test diff --git a/mtr/basic/t/default_storage_engine_by_combination.inc b/mysql-test/columnstore/basic/t/default_storage_engine_by_combination.inc similarity index 100% rename from mtr/basic/t/default_storage_engine_by_combination.inc rename to mysql-test/columnstore/basic/t/default_storage_engine_by_combination.inc diff --git a/mtr/basic/t/func_bit.test b/mysql-test/columnstore/basic/t/func_bit.test similarity index 100% rename from mtr/basic/t/func_bit.test rename to mysql-test/columnstore/basic/t/func_bit.test diff --git a/mtr/basic/t/func_bit_mcs.test b/mysql-test/columnstore/basic/t/func_bit_mcs.test similarity index 100% rename from mtr/basic/t/func_bit_mcs.test rename to mysql-test/columnstore/basic/t/func_bit_mcs.test diff --git a/mtr/basic/t/func_cast.test b/mysql-test/columnstore/basic/t/func_cast.test similarity index 100% rename from mtr/basic/t/func_cast.test rename to mysql-test/columnstore/basic/t/func_cast.test diff --git a/mtr/basic/t/func_period_diff.test b/mysql-test/columnstore/basic/t/func_period_diff.test similarity index 100% rename from mtr/basic/t/func_period_diff.test rename to mysql-test/columnstore/basic/t/func_period_diff.test diff --git a/mtr/basic/t/func_sec_to_time.test b/mysql-test/columnstore/basic/t/func_sec_to_time.test similarity index 100% rename from mtr/basic/t/func_sec_to_time.test rename to mysql-test/columnstore/basic/t/func_sec_to_time.test diff --git a/mtr/basic/t/mcol2044_signed_bigint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_bigint_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_bigint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_bigint_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_bigint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_bigint_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_signed_bigint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_bigint_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_bigint_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_signed_bigint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_bigint_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_bigint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_bigint_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_bigint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_bigint_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_signed_bigint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_bigint_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_signed_bigint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_bigint_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-within-range.test diff --git a/mtr/basic/t/mcol2044_signed_dec38_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_dec38_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_dec38_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_dec38_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_dec38_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_dec38_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_signed_dec38_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_dec38_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_dec38_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_signed_dec38_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_dec38_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_dec38_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_dec38_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_dec38_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_dec38_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_signed_dec38_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_dec38_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_signed_dec38_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_dec38_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-within-range.test diff --git a/mtr/basic/t/mcol2044_signed_integer_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_integer_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_integer_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_integer_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_integer_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_integer_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_signed_integer_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_integer_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_integer_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_signed_integer_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_integer_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_integer_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_integer_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_integer_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_integer_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_signed_integer_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_integer_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_signed_integer_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_integer_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-within-range.test diff --git a/mtr/basic/t/mcol2044_signed_smallint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_smallint_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_smallint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_smallint_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_smallint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_smallint_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_signed_smallint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_smallint_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_smallint_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_signed_smallint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_smallint_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_smallint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_smallint_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_smallint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_smallint_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_signed_smallint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_smallint_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_signed_smallint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_smallint_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-within-range.test diff --git a/mtr/basic/t/mcol2044_signed_tinyint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_tinyint_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_tinyint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_tinyint_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_tinyint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_tinyint_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_signed_tinyint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_tinyint_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_signed_tinyint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_tinyint_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_signed_tinyint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_tinyint_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_signed_tinyint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_tinyint_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_signed_tinyint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_tinyint_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_signed_tinyint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_signed_tinyint_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_bigint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_bigint_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_bigint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_bigint_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_bigint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_bigint_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_bigint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_bigint_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_bigint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_bigint_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_bigint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_bigint_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_bigint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_bigint_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_bigint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_bigint_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_bigint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_bigint_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_dec38_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_dec38_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_dec38_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_dec38_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_dec38_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_dec38_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_dec38_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_dec38_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_dec38_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_dec38_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_dec38_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_dec38_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_dec38_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_dec38_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_dec38_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_dec38_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_dec38_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_dec38_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_integer_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_integer_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_integer_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_integer_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_integer_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_integer_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_integer_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_integer_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_integer_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_integer_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_integer_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_integer_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_integer_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_integer_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_integer_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_integer_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_integer_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_integer_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_smallint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_smallint_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_smallint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_smallint_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_smallint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_smallint_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_smallint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_smallint_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_smallint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_smallint_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_smallint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_smallint_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_smallint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_smallint_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_smallint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_smallint_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_smallint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_smallint_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_tinyint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_tinyint_delete-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_tinyint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_tinyint_delete-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_tinyint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_tinyint_delete-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-within-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.test diff --git a/mtr/basic/t/mcol2044_unsigned_tinyint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_tinyint_update-drop-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_tinyint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_tinyint_update-drop-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_tinyint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-max.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_tinyint_update-extends-max.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-max.test diff --git a/mtr/basic/t/mcol2044_unsigned_tinyint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-min.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_tinyint_update-extends-min.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-min.test diff --git a/mtr/basic/t/mcol2044_unsigned_tinyint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-within-range.test similarity index 100% rename from mtr/basic/t/mcol2044_unsigned_tinyint_update-within-range.test rename to mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-within-range.test diff --git a/mtr/basic/t/mcol_2000.test b/mysql-test/columnstore/basic/t/mcol_2000.test similarity index 100% rename from mtr/basic/t/mcol_2000.test rename to mysql-test/columnstore/basic/t/mcol_2000.test diff --git a/mtr/basic/t/mcol_4222.test b/mysql-test/columnstore/basic/t/mcol_4222.test similarity index 100% rename from mtr/basic/t/mcol_4222.test rename to mysql-test/columnstore/basic/t/mcol_4222.test diff --git a/mtr/basic/t/mcs102_ldi_transform_csv.test b/mysql-test/columnstore/basic/t/mcs102_ldi_transform_csv.test similarity index 100% rename from mtr/basic/t/mcs102_ldi_transform_csv.test rename to mysql-test/columnstore/basic/t/mcs102_ldi_transform_csv.test diff --git a/mtr/basic/t/mcs103_ldi_fields_enclosed_by.test b/mysql-test/columnstore/basic/t/mcs103_ldi_fields_enclosed_by.test similarity index 100% rename from mtr/basic/t/mcs103_ldi_fields_enclosed_by.test rename to mysql-test/columnstore/basic/t/mcs103_ldi_fields_enclosed_by.test diff --git a/mtr/basic/t/mcs104_ldi_fields_escaped_by.test b/mysql-test/columnstore/basic/t/mcs104_ldi_fields_escaped_by.test similarity index 100% rename from mtr/basic/t/mcs104_ldi_fields_escaped_by.test rename to mysql-test/columnstore/basic/t/mcs104_ldi_fields_escaped_by.test diff --git a/mtr/basic/t/mcs105_ldi_lines_terminated_by.test b/mysql-test/columnstore/basic/t/mcs105_ldi_lines_terminated_by.test similarity index 100% rename from mtr/basic/t/mcs105_ldi_lines_terminated_by.test rename to mysql-test/columnstore/basic/t/mcs105_ldi_lines_terminated_by.test diff --git a/mtr/basic/t/mcs106_ldi_ignore_rows.test b/mysql-test/columnstore/basic/t/mcs106_ldi_ignore_rows.test similarity index 100% rename from mtr/basic/t/mcs106_ldi_ignore_rows.test rename to mysql-test/columnstore/basic/t/mcs106_ldi_ignore_rows.test diff --git a/mtr/basic/t/mcs10_drop_db_table.test b/mysql-test/columnstore/basic/t/mcs10_drop_db_table.test similarity index 100% rename from mtr/basic/t/mcs10_drop_db_table.test rename to mysql-test/columnstore/basic/t/mcs10_drop_db_table.test diff --git a/mtr/basic/t/mcs111_comparison_operators.test b/mysql-test/columnstore/basic/t/mcs111_comparison_operators.test similarity index 100% rename from mtr/basic/t/mcs111_comparison_operators.test rename to mysql-test/columnstore/basic/t/mcs111_comparison_operators.test diff --git a/mtr/basic/t/mcs114_comments.test b/mysql-test/columnstore/basic/t/mcs114_comments.test similarity index 100% rename from mtr/basic/t/mcs114_comments.test rename to mysql-test/columnstore/basic/t/mcs114_comments.test diff --git a/mtr/basic/t/mcs115_count_distinct.test b/mysql-test/columnstore/basic/t/mcs115_count_distinct.test similarity index 100% rename from mtr/basic/t/mcs115_count_distinct.test rename to mysql-test/columnstore/basic/t/mcs115_count_distinct.test diff --git a/mtr/basic/t/mcs116_create_or_replace.test b/mysql-test/columnstore/basic/t/mcs116_create_or_replace.test similarity index 100% rename from mtr/basic/t/mcs116_create_or_replace.test rename to mysql-test/columnstore/basic/t/mcs116_create_or_replace.test diff --git a/mtr/basic/t/mcs117_create_utf8.test b/mysql-test/columnstore/basic/t/mcs117_create_utf8.test similarity index 100% rename from mtr/basic/t/mcs117_create_utf8.test rename to mysql-test/columnstore/basic/t/mcs117_create_utf8.test diff --git a/mtr/basic/t/mcs118_charset_negative.test b/mysql-test/columnstore/basic/t/mcs118_charset_negative.test similarity index 100% rename from mtr/basic/t/mcs118_charset_negative.test rename to mysql-test/columnstore/basic/t/mcs118_charset_negative.test diff --git a/mtr/basic/t/mcs119_date_formats.test b/mysql-test/columnstore/basic/t/mcs119_date_formats.test similarity index 100% rename from mtr/basic/t/mcs119_date_formats.test rename to mysql-test/columnstore/basic/t/mcs119_date_formats.test diff --git a/mtr/basic/t/mcs11_show_db_table.test b/mysql-test/columnstore/basic/t/mcs11_show_db_table.test similarity index 100% rename from mtr/basic/t/mcs11_show_db_table.test rename to mysql-test/columnstore/basic/t/mcs11_show_db_table.test diff --git a/mtr/basic/t/mcs120_empty_table.test b/mysql-test/columnstore/basic/t/mcs120_empty_table.test similarity index 100% rename from mtr/basic/t/mcs120_empty_table.test rename to mysql-test/columnstore/basic/t/mcs120_empty_table.test diff --git a/mtr/basic/t/mcs123_window_function_cume_dist.test b/mysql-test/columnstore/basic/t/mcs123_window_function_cume_dist.test similarity index 100% rename from mtr/basic/t/mcs123_window_function_cume_dist.test rename to mysql-test/columnstore/basic/t/mcs123_window_function_cume_dist.test diff --git a/mtr/basic/t/mcs124_window_function_dense_rank.test b/mysql-test/columnstore/basic/t/mcs124_window_function_dense_rank.test similarity index 100% rename from mtr/basic/t/mcs124_window_function_dense_rank.test rename to mysql-test/columnstore/basic/t/mcs124_window_function_dense_rank.test diff --git a/mtr/basic/t/mcs125_window_function_first_value.test b/mysql-test/columnstore/basic/t/mcs125_window_function_first_value.test similarity index 100% rename from mtr/basic/t/mcs125_window_function_first_value.test rename to mysql-test/columnstore/basic/t/mcs125_window_function_first_value.test diff --git a/mtr/basic/t/mcs126_window_function_lag.test b/mysql-test/columnstore/basic/t/mcs126_window_function_lag.test similarity index 100% rename from mtr/basic/t/mcs126_window_function_lag.test rename to mysql-test/columnstore/basic/t/mcs126_window_function_lag.test diff --git a/mtr/basic/t/mcs127_window_function_last_value.test b/mysql-test/columnstore/basic/t/mcs127_window_function_last_value.test similarity index 100% rename from mtr/basic/t/mcs127_window_function_last_value.test rename to mysql-test/columnstore/basic/t/mcs127_window_function_last_value.test diff --git a/mtr/basic/t/mcs128_window_function_lead.test b/mysql-test/columnstore/basic/t/mcs128_window_function_lead.test similarity index 100% rename from mtr/basic/t/mcs128_window_function_lead.test rename to mysql-test/columnstore/basic/t/mcs128_window_function_lead.test diff --git a/mtr/basic/t/mcs129_window_function_nth_value.test b/mysql-test/columnstore/basic/t/mcs129_window_function_nth_value.test similarity index 100% rename from mtr/basic/t/mcs129_window_function_nth_value.test rename to mysql-test/columnstore/basic/t/mcs129_window_function_nth_value.test diff --git a/mtr/basic/t/mcs12_alter_table.test b/mysql-test/columnstore/basic/t/mcs12_alter_table.test similarity index 100% rename from mtr/basic/t/mcs12_alter_table.test rename to mysql-test/columnstore/basic/t/mcs12_alter_table.test diff --git a/mtr/basic/t/mcs130_window_function_ntile.test b/mysql-test/columnstore/basic/t/mcs130_window_function_ntile.test similarity index 100% rename from mtr/basic/t/mcs130_window_function_ntile.test rename to mysql-test/columnstore/basic/t/mcs130_window_function_ntile.test diff --git a/mtr/basic/t/mcs131_window_function_percent_rank.test b/mysql-test/columnstore/basic/t/mcs131_window_function_percent_rank.test similarity index 100% rename from mtr/basic/t/mcs131_window_function_percent_rank.test rename to mysql-test/columnstore/basic/t/mcs131_window_function_percent_rank.test diff --git a/mtr/basic/t/mcs132_window_function_percentile_cont.test b/mysql-test/columnstore/basic/t/mcs132_window_function_percentile_cont.test similarity index 100% rename from mtr/basic/t/mcs132_window_function_percentile_cont.test rename to mysql-test/columnstore/basic/t/mcs132_window_function_percentile_cont.test diff --git a/mtr/basic/t/mcs133_window_function_percentile_disc.test b/mysql-test/columnstore/basic/t/mcs133_window_function_percentile_disc.test similarity index 100% rename from mtr/basic/t/mcs133_window_function_percentile_disc.test rename to mysql-test/columnstore/basic/t/mcs133_window_function_percentile_disc.test diff --git a/mtr/basic/t/mcs134_window_function_rank.test b/mysql-test/columnstore/basic/t/mcs134_window_function_rank.test similarity index 100% rename from mtr/basic/t/mcs134_window_function_rank.test rename to mysql-test/columnstore/basic/t/mcs134_window_function_rank.test diff --git a/mtr/basic/t/mcs135_window_function_row_number.test b/mysql-test/columnstore/basic/t/mcs135_window_function_row_number.test similarity index 100% rename from mtr/basic/t/mcs135_window_function_row_number.test rename to mysql-test/columnstore/basic/t/mcs135_window_function_row_number.test diff --git a/mtr/basic/t/mcs136_window_function_sum.test b/mysql-test/columnstore/basic/t/mcs136_window_function_sum.test similarity index 100% rename from mtr/basic/t/mcs136_window_function_sum.test rename to mysql-test/columnstore/basic/t/mcs136_window_function_sum.test diff --git a/mtr/basic/t/mcs137_window_function_count.test b/mysql-test/columnstore/basic/t/mcs137_window_function_count.test similarity index 100% rename from mtr/basic/t/mcs137_window_function_count.test rename to mysql-test/columnstore/basic/t/mcs137_window_function_count.test diff --git a/mtr/basic/t/mcs138_window_function_max.test b/mysql-test/columnstore/basic/t/mcs138_window_function_max.test similarity index 100% rename from mtr/basic/t/mcs138_window_function_max.test rename to mysql-test/columnstore/basic/t/mcs138_window_function_max.test diff --git a/mtr/basic/t/mcs139_window_function_min.test b/mysql-test/columnstore/basic/t/mcs139_window_function_min.test similarity index 100% rename from mtr/basic/t/mcs139_window_function_min.test rename to mysql-test/columnstore/basic/t/mcs139_window_function_min.test diff --git a/mtr/basic/t/mcs13_alter_table_negative.test b/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test similarity index 100% rename from mtr/basic/t/mcs13_alter_table_negative.test rename to mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test diff --git a/mtr/basic/t/mcs140_window_function_median.test b/mysql-test/columnstore/basic/t/mcs140_window_function_median.test similarity index 100% rename from mtr/basic/t/mcs140_window_function_median.test rename to mysql-test/columnstore/basic/t/mcs140_window_function_median.test diff --git a/mtr/basic/t/mcs141_window_function_std.test b/mysql-test/columnstore/basic/t/mcs141_window_function_std.test similarity index 100% rename from mtr/basic/t/mcs141_window_function_std.test rename to mysql-test/columnstore/basic/t/mcs141_window_function_std.test diff --git a/mtr/basic/t/mcs142_window_function_stddev.test b/mysql-test/columnstore/basic/t/mcs142_window_function_stddev.test similarity index 100% rename from mtr/basic/t/mcs142_window_function_stddev.test rename to mysql-test/columnstore/basic/t/mcs142_window_function_stddev.test diff --git a/mtr/basic/t/mcs143_window_function_stddev_pop.test b/mysql-test/columnstore/basic/t/mcs143_window_function_stddev_pop.test similarity index 100% rename from mtr/basic/t/mcs143_window_function_stddev_pop.test rename to mysql-test/columnstore/basic/t/mcs143_window_function_stddev_pop.test diff --git a/mtr/basic/t/mcs144_window_function_stddev_samp.test b/mysql-test/columnstore/basic/t/mcs144_window_function_stddev_samp.test similarity index 100% rename from mtr/basic/t/mcs144_window_function_stddev_samp.test rename to mysql-test/columnstore/basic/t/mcs144_window_function_stddev_samp.test diff --git a/mtr/basic/t/mcs145_window_function_variance.test b/mysql-test/columnstore/basic/t/mcs145_window_function_variance.test similarity index 100% rename from mtr/basic/t/mcs145_window_function_variance.test rename to mysql-test/columnstore/basic/t/mcs145_window_function_variance.test diff --git a/mtr/basic/t/mcs146_window_function_var_pop.test b/mysql-test/columnstore/basic/t/mcs146_window_function_var_pop.test similarity index 100% rename from mtr/basic/t/mcs146_window_function_var_pop.test rename to mysql-test/columnstore/basic/t/mcs146_window_function_var_pop.test diff --git a/mtr/basic/t/mcs147_window_function_var_samp.test b/mysql-test/columnstore/basic/t/mcs147_window_function_var_samp.test similarity index 100% rename from mtr/basic/t/mcs147_window_function_var_samp.test rename to mysql-test/columnstore/basic/t/mcs147_window_function_var_samp.test diff --git a/mtr/basic/t/mcs148_window_function_bit_or.test b/mysql-test/columnstore/basic/t/mcs148_window_function_bit_or.test similarity index 100% rename from mtr/basic/t/mcs148_window_function_bit_or.test rename to mysql-test/columnstore/basic/t/mcs148_window_function_bit_or.test diff --git a/mtr/basic/t/mcs149_window_function_bit_and.test b/mysql-test/columnstore/basic/t/mcs149_window_function_bit_and.test similarity index 100% rename from mtr/basic/t/mcs149_window_function_bit_and.test rename to mysql-test/columnstore/basic/t/mcs149_window_function_bit_and.test diff --git a/mtr/basic/t/mcs14_truncate_table.test b/mysql-test/columnstore/basic/t/mcs14_truncate_table.test similarity index 100% rename from mtr/basic/t/mcs14_truncate_table.test rename to mysql-test/columnstore/basic/t/mcs14_truncate_table.test diff --git a/mtr/basic/t/mcs150_window_function_bit_xor.test b/mysql-test/columnstore/basic/t/mcs150_window_function_bit_xor.test similarity index 100% rename from mtr/basic/t/mcs150_window_function_bit_xor.test rename to mysql-test/columnstore/basic/t/mcs150_window_function_bit_xor.test diff --git a/mtr/basic/t/mcs151_window_function_avg.test b/mysql-test/columnstore/basic/t/mcs151_window_function_avg.test similarity index 100% rename from mtr/basic/t/mcs151_window_function_avg.test rename to mysql-test/columnstore/basic/t/mcs151_window_function_avg.test diff --git a/mtr/basic/t/mcs152_win_frame_avg.test b/mysql-test/columnstore/basic/t/mcs152_win_frame_avg.test similarity index 100% rename from mtr/basic/t/mcs152_win_frame_avg.test rename to mysql-test/columnstore/basic/t/mcs152_win_frame_avg.test diff --git a/mtr/basic/t/mcs153_win_frame_bit_and.test b/mysql-test/columnstore/basic/t/mcs153_win_frame_bit_and.test similarity index 100% rename from mtr/basic/t/mcs153_win_frame_bit_and.test rename to mysql-test/columnstore/basic/t/mcs153_win_frame_bit_and.test diff --git a/mtr/basic/t/mcs154_win_frame_bit_or.test b/mysql-test/columnstore/basic/t/mcs154_win_frame_bit_or.test similarity index 100% rename from mtr/basic/t/mcs154_win_frame_bit_or.test rename to mysql-test/columnstore/basic/t/mcs154_win_frame_bit_or.test diff --git a/mtr/basic/t/mcs155_win_frame_bit_xor.test b/mysql-test/columnstore/basic/t/mcs155_win_frame_bit_xor.test similarity index 100% rename from mtr/basic/t/mcs155_win_frame_bit_xor.test rename to mysql-test/columnstore/basic/t/mcs155_win_frame_bit_xor.test diff --git a/mtr/basic/t/mcs156_win_frame_count.test b/mysql-test/columnstore/basic/t/mcs156_win_frame_count.test similarity index 100% rename from mtr/basic/t/mcs156_win_frame_count.test rename to mysql-test/columnstore/basic/t/mcs156_win_frame_count.test diff --git a/mtr/basic/t/mcs157_win_frame_lead.test b/mysql-test/columnstore/basic/t/mcs157_win_frame_lead.test similarity index 100% rename from mtr/basic/t/mcs157_win_frame_lead.test rename to mysql-test/columnstore/basic/t/mcs157_win_frame_lead.test diff --git a/mtr/basic/t/mcs158_win_frame_max.test b/mysql-test/columnstore/basic/t/mcs158_win_frame_max.test similarity index 100% rename from mtr/basic/t/mcs158_win_frame_max.test rename to mysql-test/columnstore/basic/t/mcs158_win_frame_max.test diff --git a/mtr/basic/t/mcs159_win_frame_min.test b/mysql-test/columnstore/basic/t/mcs159_win_frame_min.test similarity index 100% rename from mtr/basic/t/mcs159_win_frame_min.test rename to mysql-test/columnstore/basic/t/mcs159_win_frame_min.test diff --git a/mtr/basic/t/mcs15_views_create_query_drop.test b/mysql-test/columnstore/basic/t/mcs15_views_create_query_drop.test similarity index 100% rename from mtr/basic/t/mcs15_views_create_query_drop.test rename to mysql-test/columnstore/basic/t/mcs15_views_create_query_drop.test diff --git a/mtr/basic/t/mcs160_win_frame_ntile.test b/mysql-test/columnstore/basic/t/mcs160_win_frame_ntile.test similarity index 100% rename from mtr/basic/t/mcs160_win_frame_ntile.test rename to mysql-test/columnstore/basic/t/mcs160_win_frame_ntile.test diff --git a/mtr/basic/t/mcs161_win_frame_std.test b/mysql-test/columnstore/basic/t/mcs161_win_frame_std.test similarity index 100% rename from mtr/basic/t/mcs161_win_frame_std.test rename to mysql-test/columnstore/basic/t/mcs161_win_frame_std.test diff --git a/mtr/basic/t/mcs162_win_frame_stddev.test b/mysql-test/columnstore/basic/t/mcs162_win_frame_stddev.test similarity index 100% rename from mtr/basic/t/mcs162_win_frame_stddev.test rename to mysql-test/columnstore/basic/t/mcs162_win_frame_stddev.test diff --git a/mtr/basic/t/mcs163_win_frame_stddev_pop.test b/mysql-test/columnstore/basic/t/mcs163_win_frame_stddev_pop.test similarity index 100% rename from mtr/basic/t/mcs163_win_frame_stddev_pop.test rename to mysql-test/columnstore/basic/t/mcs163_win_frame_stddev_pop.test diff --git a/mtr/basic/t/mcs164_win_frame_stddev_samp.test b/mysql-test/columnstore/basic/t/mcs164_win_frame_stddev_samp.test similarity index 100% rename from mtr/basic/t/mcs164_win_frame_stddev_samp.test rename to mysql-test/columnstore/basic/t/mcs164_win_frame_stddev_samp.test diff --git a/mtr/basic/t/mcs165_win_frame_sum.test b/mysql-test/columnstore/basic/t/mcs165_win_frame_sum.test similarity index 100% rename from mtr/basic/t/mcs165_win_frame_sum.test rename to mysql-test/columnstore/basic/t/mcs165_win_frame_sum.test diff --git a/mtr/basic/t/mcs166_win_frame_var_pop.test b/mysql-test/columnstore/basic/t/mcs166_win_frame_var_pop.test similarity index 100% rename from mtr/basic/t/mcs166_win_frame_var_pop.test rename to mysql-test/columnstore/basic/t/mcs166_win_frame_var_pop.test diff --git a/mtr/basic/t/mcs167_win_frame_var_samp.test b/mysql-test/columnstore/basic/t/mcs167_win_frame_var_samp.test similarity index 100% rename from mtr/basic/t/mcs167_win_frame_var_samp.test rename to mysql-test/columnstore/basic/t/mcs167_win_frame_var_samp.test diff --git a/mtr/basic/t/mcs168_win_frame_variance.test b/mysql-test/columnstore/basic/t/mcs168_win_frame_variance.test similarity index 100% rename from mtr/basic/t/mcs168_win_frame_variance.test rename to mysql-test/columnstore/basic/t/mcs168_win_frame_variance.test diff --git a/mtr/basic/t/mcs169_bin_functions.test b/mysql-test/columnstore/basic/t/mcs169_bin_functions.test similarity index 100% rename from mtr/basic/t/mcs169_bin_functions.test rename to mysql-test/columnstore/basic/t/mcs169_bin_functions.test diff --git a/mtr/basic/t/mcs16_functions_define_call_drop.test b/mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test similarity index 100% rename from mtr/basic/t/mcs16_functions_define_call_drop.test rename to mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test diff --git a/mtr/basic/t/mcs170_session_functions.test b/mysql-test/columnstore/basic/t/mcs170_session_functions.test similarity index 100% rename from mtr/basic/t/mcs170_session_functions.test rename to mysql-test/columnstore/basic/t/mcs170_session_functions.test diff --git a/mtr/basic/t/mcs171_null_functions.test b/mysql-test/columnstore/basic/t/mcs171_null_functions.test similarity index 100% rename from mtr/basic/t/mcs171_null_functions.test rename to mysql-test/columnstore/basic/t/mcs171_null_functions.test diff --git a/mtr/basic/t/mcs172_last_insert_id.test b/mysql-test/columnstore/basic/t/mcs172_last_insert_id.test similarity index 100% rename from mtr/basic/t/mcs172_last_insert_id.test rename to mysql-test/columnstore/basic/t/mcs172_last_insert_id.test diff --git a/mtr/basic/t/mcs173_coalesce_function.test b/mysql-test/columnstore/basic/t/mcs173_coalesce_function.test similarity index 100% rename from mtr/basic/t/mcs173_coalesce_function.test rename to mysql-test/columnstore/basic/t/mcs173_coalesce_function.test diff --git a/mtr/basic/t/mcs174_case_function.test b/mysql-test/columnstore/basic/t/mcs174_case_function.test similarity index 100% rename from mtr/basic/t/mcs174_case_function.test rename to mysql-test/columnstore/basic/t/mcs174_case_function.test diff --git a/mtr/basic/t/mcs175_convert_functions.test b/mysql-test/columnstore/basic/t/mcs175_convert_functions.test similarity index 100% rename from mtr/basic/t/mcs175_convert_functions.test rename to mysql-test/columnstore/basic/t/mcs175_convert_functions.test diff --git a/mtr/basic/t/mcs176_if_function.test b/mysql-test/columnstore/basic/t/mcs176_if_function.test similarity index 100% rename from mtr/basic/t/mcs176_if_function.test rename to mysql-test/columnstore/basic/t/mcs176_if_function.test diff --git a/mtr/basic/t/mcs177_bitwise_operators.test b/mysql-test/columnstore/basic/t/mcs177_bitwise_operators.test similarity index 100% rename from mtr/basic/t/mcs177_bitwise_operators.test rename to mysql-test/columnstore/basic/t/mcs177_bitwise_operators.test diff --git a/mtr/basic/t/mcs178_adddate_function.test b/mysql-test/columnstore/basic/t/mcs178_adddate_function.test similarity index 100% rename from mtr/basic/t/mcs178_adddate_function.test rename to mysql-test/columnstore/basic/t/mcs178_adddate_function.test diff --git a/mtr/basic/t/mcs179_addtime_function.test b/mysql-test/columnstore/basic/t/mcs179_addtime_function.test similarity index 100% rename from mtr/basic/t/mcs179_addtime_function.test rename to mysql-test/columnstore/basic/t/mcs179_addtime_function.test diff --git a/mtr/basic/t/mcs17_procedures_define_call_drop.test b/mysql-test/columnstore/basic/t/mcs17_procedures_define_call_drop.test similarity index 100% rename from mtr/basic/t/mcs17_procedures_define_call_drop.test rename to mysql-test/columnstore/basic/t/mcs17_procedures_define_call_drop.test diff --git a/mtr/basic/t/mcs180_ascii_function.test b/mysql-test/columnstore/basic/t/mcs180_ascii_function.test similarity index 100% rename from mtr/basic/t/mcs180_ascii_function.test rename to mysql-test/columnstore/basic/t/mcs180_ascii_function.test diff --git a/mtr/basic/t/mcs181_between_and.test b/mysql-test/columnstore/basic/t/mcs181_between_and.test similarity index 100% rename from mtr/basic/t/mcs181_between_and.test rename to mysql-test/columnstore/basic/t/mcs181_between_and.test diff --git a/mtr/basic/t/mcs182_char_length_function.test b/mysql-test/columnstore/basic/t/mcs182_char_length_function.test similarity index 100% rename from mtr/basic/t/mcs182_char_length_function.test rename to mysql-test/columnstore/basic/t/mcs182_char_length_function.test diff --git a/mtr/basic/t/mcs183_date_function.test b/mysql-test/columnstore/basic/t/mcs183_date_function.test similarity index 100% rename from mtr/basic/t/mcs183_date_function.test rename to mysql-test/columnstore/basic/t/mcs183_date_function.test diff --git a/mtr/basic/t/mcs184_day_function.test b/mysql-test/columnstore/basic/t/mcs184_day_function.test similarity index 100% rename from mtr/basic/t/mcs184_day_function.test rename to mysql-test/columnstore/basic/t/mcs184_day_function.test diff --git a/mtr/basic/t/mcs185_dayname_function.test b/mysql-test/columnstore/basic/t/mcs185_dayname_function.test similarity index 100% rename from mtr/basic/t/mcs185_dayname_function.test rename to mysql-test/columnstore/basic/t/mcs185_dayname_function.test diff --git a/mtr/basic/t/mcs186_dayofyear_function.test b/mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test similarity index 100% rename from mtr/basic/t/mcs186_dayofyear_function.test rename to mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test diff --git a/mtr/basic/t/mcs187_dayofmonth_function.test b/mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test similarity index 100% rename from mtr/basic/t/mcs187_dayofmonth_function.test rename to mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test diff --git a/mtr/basic/t/mcs188_avg_function.test b/mysql-test/columnstore/basic/t/mcs188_avg_function.test similarity index 100% rename from mtr/basic/t/mcs188_avg_function.test rename to mysql-test/columnstore/basic/t/mcs188_avg_function.test diff --git a/mtr/basic/t/mcs189_sum_function.test b/mysql-test/columnstore/basic/t/mcs189_sum_function.test similarity index 100% rename from mtr/basic/t/mcs189_sum_function.test rename to mysql-test/columnstore/basic/t/mcs189_sum_function.test diff --git a/mtr/basic/t/mcs18_create_drop_users.test b/mysql-test/columnstore/basic/t/mcs18_create_drop_users.test similarity index 100% rename from mtr/basic/t/mcs18_create_drop_users.test rename to mysql-test/columnstore/basic/t/mcs18_create_drop_users.test diff --git a/mtr/basic/t/mcs190_max_function.test b/mysql-test/columnstore/basic/t/mcs190_max_function.test similarity index 100% rename from mtr/basic/t/mcs190_max_function.test rename to mysql-test/columnstore/basic/t/mcs190_max_function.test diff --git a/mtr/basic/t/mcs191_min_function.test b/mysql-test/columnstore/basic/t/mcs191_min_function.test similarity index 100% rename from mtr/basic/t/mcs191_min_function.test rename to mysql-test/columnstore/basic/t/mcs191_min_function.test diff --git a/mtr/basic/t/mcs192_corr_function.test b/mysql-test/columnstore/basic/t/mcs192_corr_function.test similarity index 100% rename from mtr/basic/t/mcs192_corr_function.test rename to mysql-test/columnstore/basic/t/mcs192_corr_function.test diff --git a/mtr/basic/t/mcs193_covar_pop_function.test b/mysql-test/columnstore/basic/t/mcs193_covar_pop_function.test similarity index 100% rename from mtr/basic/t/mcs193_covar_pop_function.test rename to mysql-test/columnstore/basic/t/mcs193_covar_pop_function.test diff --git a/mtr/basic/t/mcs194_covar_samp_function.test b/mysql-test/columnstore/basic/t/mcs194_covar_samp_function.test similarity index 100% rename from mtr/basic/t/mcs194_covar_samp_function.test rename to mysql-test/columnstore/basic/t/mcs194_covar_samp_function.test diff --git a/mtr/basic/t/mcs195_regr_avgx_avgy_function.test b/mysql-test/columnstore/basic/t/mcs195_regr_avgx_avgy_function.test similarity index 100% rename from mtr/basic/t/mcs195_regr_avgx_avgy_function.test rename to mysql-test/columnstore/basic/t/mcs195_regr_avgx_avgy_function.test diff --git a/mtr/basic/t/mcs196_regr_sxx_sxy_syy_functions.test b/mysql-test/columnstore/basic/t/mcs196_regr_sxx_sxy_syy_functions.test similarity index 100% rename from mtr/basic/t/mcs196_regr_sxx_sxy_syy_functions.test rename to mysql-test/columnstore/basic/t/mcs196_regr_sxx_sxy_syy_functions.test diff --git a/mtr/basic/t/mcs197_regr_count_function.test b/mysql-test/columnstore/basic/t/mcs197_regr_count_function.test similarity index 100% rename from mtr/basic/t/mcs197_regr_count_function.test rename to mysql-test/columnstore/basic/t/mcs197_regr_count_function.test diff --git a/mtr/basic/t/mcs198_regr_intercept_function.test b/mysql-test/columnstore/basic/t/mcs198_regr_intercept_function.test similarity index 100% rename from mtr/basic/t/mcs198_regr_intercept_function.test rename to mysql-test/columnstore/basic/t/mcs198_regr_intercept_function.test diff --git a/mtr/basic/t/mcs199_regr_r2_function.test b/mysql-test/columnstore/basic/t/mcs199_regr_r2_function.test similarity index 100% rename from mtr/basic/t/mcs199_regr_r2_function.test rename to mysql-test/columnstore/basic/t/mcs199_regr_r2_function.test diff --git a/mtr/basic/t/mcs19_grant_revoke.test b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test similarity index 100% rename from mtr/basic/t/mcs19_grant_revoke.test rename to mysql-test/columnstore/basic/t/mcs19_grant_revoke.test diff --git a/mtr/basic/t/mcs1_create_table_data_types.test b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test similarity index 100% rename from mtr/basic/t/mcs1_create_table_data_types.test rename to mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test diff --git a/mtr/basic/t/mcs200_regr_slope_function.test b/mysql-test/columnstore/basic/t/mcs200_regr_slope_function.test similarity index 100% rename from mtr/basic/t/mcs200_regr_slope_function.test rename to mysql-test/columnstore/basic/t/mcs200_regr_slope_function.test diff --git a/mtr/basic/t/mcs201_calshowpartitions_function.test b/mysql-test/columnstore/basic/t/mcs201_calshowpartitions_function.test similarity index 100% rename from mtr/basic/t/mcs201_calshowpartitions_function.test rename to mysql-test/columnstore/basic/t/mcs201_calshowpartitions_function.test diff --git a/mtr/basic/t/mcs202_caldisablepartitions_function.test b/mysql-test/columnstore/basic/t/mcs202_caldisablepartitions_function.test similarity index 100% rename from mtr/basic/t/mcs202_caldisablepartitions_function.test rename to mysql-test/columnstore/basic/t/mcs202_caldisablepartitions_function.test diff --git a/mtr/basic/t/mcs203_calenablepartitions_function.test b/mysql-test/columnstore/basic/t/mcs203_calenablepartitions_function.test similarity index 100% rename from mtr/basic/t/mcs203_calenablepartitions_function.test rename to mysql-test/columnstore/basic/t/mcs203_calenablepartitions_function.test diff --git a/mtr/basic/t/mcs204_caldroppartitions_function.test b/mysql-test/columnstore/basic/t/mcs204_caldroppartitions_function.test similarity index 100% rename from mtr/basic/t/mcs204_caldroppartitions_function.test rename to mysql-test/columnstore/basic/t/mcs204_caldroppartitions_function.test diff --git a/mtr/basic/t/mcs205_inet_aton_function.test b/mysql-test/columnstore/basic/t/mcs205_inet_aton_function.test similarity index 100% rename from mtr/basic/t/mcs205_inet_aton_function.test rename to mysql-test/columnstore/basic/t/mcs205_inet_aton_function.test diff --git a/mtr/basic/t/mcs206_inet_ntoa_function.test b/mysql-test/columnstore/basic/t/mcs206_inet_ntoa_function.test similarity index 100% rename from mtr/basic/t/mcs206_inet_ntoa_function.test rename to mysql-test/columnstore/basic/t/mcs206_inet_ntoa_function.test diff --git a/mtr/basic/t/mcs207_utility_functions.test b/mysql-test/columnstore/basic/t/mcs207_utility_functions.test similarity index 100% rename from mtr/basic/t/mcs207_utility_functions.test rename to mysql-test/columnstore/basic/t/mcs207_utility_functions.test diff --git a/mtr/basic/t/mcs208_idbPartition_function.test b/mysql-test/columnstore/basic/t/mcs208_idbPartition_function.test similarity index 100% rename from mtr/basic/t/mcs208_idbPartition_function.test rename to mysql-test/columnstore/basic/t/mcs208_idbPartition_function.test diff --git a/mtr/basic/t/mcs209_idbDBRoot_function.test b/mysql-test/columnstore/basic/t/mcs209_idbDBRoot_function.test similarity index 100% rename from mtr/basic/t/mcs209_idbDBRoot_function.test rename to mysql-test/columnstore/basic/t/mcs209_idbDBRoot_function.test diff --git a/mtr/basic/t/mcs20_insert_all_data_types.test b/mysql-test/columnstore/basic/t/mcs20_insert_all_data_types.test similarity index 100% rename from mtr/basic/t/mcs20_insert_all_data_types.test rename to mysql-test/columnstore/basic/t/mcs20_insert_all_data_types.test diff --git a/mtr/basic/t/mcs210_idbPm_function.test b/mysql-test/columnstore/basic/t/mcs210_idbPm_function.test similarity index 100% rename from mtr/basic/t/mcs210_idbPm_function.test rename to mysql-test/columnstore/basic/t/mcs210_idbPm_function.test diff --git a/mtr/basic/t/mcs211_idbExtentId_function.test b/mysql-test/columnstore/basic/t/mcs211_idbExtentId_function.test similarity index 100% rename from mtr/basic/t/mcs211_idbExtentId_function.test rename to mysql-test/columnstore/basic/t/mcs211_idbExtentId_function.test diff --git a/mtr/basic/t/mcs212_idbExtentMax_function.test b/mysql-test/columnstore/basic/t/mcs212_idbExtentMax_function.test similarity index 100% rename from mtr/basic/t/mcs212_idbExtentMax_function.test rename to mysql-test/columnstore/basic/t/mcs212_idbExtentMax_function.test diff --git a/mtr/basic/t/mcs213_idbExtentMin_function.test b/mysql-test/columnstore/basic/t/mcs213_idbExtentMin_function.test similarity index 100% rename from mtr/basic/t/mcs213_idbExtentMin_function.test rename to mysql-test/columnstore/basic/t/mcs213_idbExtentMin_function.test diff --git a/mtr/basic/t/mcs214_idbExtentRelativeRid_function.test b/mysql-test/columnstore/basic/t/mcs214_idbExtentRelativeRid_function.test similarity index 100% rename from mtr/basic/t/mcs214_idbExtentRelativeRid_function.test rename to mysql-test/columnstore/basic/t/mcs214_idbExtentRelativeRid_function.test diff --git a/mtr/basic/t/mcs215_idbSegment_function.test b/mysql-test/columnstore/basic/t/mcs215_idbSegment_function.test similarity index 100% rename from mtr/basic/t/mcs215_idbSegment_function.test rename to mysql-test/columnstore/basic/t/mcs215_idbSegment_function.test diff --git a/mtr/basic/t/mcs216_idbSegmentDir_function.test b/mysql-test/columnstore/basic/t/mcs216_idbSegmentDir_function.test similarity index 100% rename from mtr/basic/t/mcs216_idbSegmentDir_function.test rename to mysql-test/columnstore/basic/t/mcs216_idbSegmentDir_function.test diff --git a/mtr/basic/t/mcs217_makedate_function.test b/mysql-test/columnstore/basic/t/mcs217_makedate_function.test similarity index 100% rename from mtr/basic/t/mcs217_makedate_function.test rename to mysql-test/columnstore/basic/t/mcs217_makedate_function.test diff --git a/mtr/basic/t/mcs218_md5_function.test b/mysql-test/columnstore/basic/t/mcs218_md5_function.test similarity index 100% rename from mtr/basic/t/mcs218_md5_function.test rename to mysql-test/columnstore/basic/t/mcs218_md5_function.test diff --git a/mtr/basic/t/mcs219_mid_function.test b/mysql-test/columnstore/basic/t/mcs219_mid_function.test similarity index 100% rename from mtr/basic/t/mcs219_mid_function.test rename to mysql-test/columnstore/basic/t/mcs219_mid_function.test diff --git a/mtr/basic/t/mcs21_insert_all_charset_collation.test b/mysql-test/columnstore/basic/t/mcs21_insert_all_charset_collation.test similarity index 100% rename from mtr/basic/t/mcs21_insert_all_charset_collation.test rename to mysql-test/columnstore/basic/t/mcs21_insert_all_charset_collation.test diff --git a/mtr/basic/t/mcs220_period_add_function.test b/mysql-test/columnstore/basic/t/mcs220_period_add_function.test similarity index 100% rename from mtr/basic/t/mcs220_period_add_function.test rename to mysql-test/columnstore/basic/t/mcs220_period_add_function.test diff --git a/mtr/basic/t/mcs221_period_diff_function.test b/mysql-test/columnstore/basic/t/mcs221_period_diff_function.test similarity index 100% rename from mtr/basic/t/mcs221_period_diff_function.test rename to mysql-test/columnstore/basic/t/mcs221_period_diff_function.test diff --git a/mtr/basic/t/mcs222_position_function.test b/mysql-test/columnstore/basic/t/mcs222_position_function.test similarity index 100% rename from mtr/basic/t/mcs222_position_function.test rename to mysql-test/columnstore/basic/t/mcs222_position_function.test diff --git a/mtr/basic/t/mcs223_quarter_function.test b/mysql-test/columnstore/basic/t/mcs223_quarter_function.test similarity index 100% rename from mtr/basic/t/mcs223_quarter_function.test rename to mysql-test/columnstore/basic/t/mcs223_quarter_function.test diff --git a/mtr/basic/t/mcs224_repeat_function.test b/mysql-test/columnstore/basic/t/mcs224_repeat_function.test similarity index 100% rename from mtr/basic/t/mcs224_repeat_function.test rename to mysql-test/columnstore/basic/t/mcs224_repeat_function.test diff --git a/mtr/basic/t/mcs225_replace_function.test b/mysql-test/columnstore/basic/t/mcs225_replace_function.test similarity index 100% rename from mtr/basic/t/mcs225_replace_function.test rename to mysql-test/columnstore/basic/t/mcs225_replace_function.test diff --git a/mtr/basic/t/mcs226_elt_function.test b/mysql-test/columnstore/basic/t/mcs226_elt_function.test similarity index 100% rename from mtr/basic/t/mcs226_elt_function.test rename to mysql-test/columnstore/basic/t/mcs226_elt_function.test diff --git a/mtr/basic/t/mcs227_div_function.test b/mysql-test/columnstore/basic/t/mcs227_div_function.test similarity index 100% rename from mtr/basic/t/mcs227_div_function.test rename to mysql-test/columnstore/basic/t/mcs227_div_function.test diff --git a/mtr/basic/t/mcs228_regexp_operator.test b/mysql-test/columnstore/basic/t/mcs228_regexp_operator.test similarity index 100% rename from mtr/basic/t/mcs228_regexp_operator.test rename to mysql-test/columnstore/basic/t/mcs228_regexp_operator.test diff --git a/mtr/basic/t/mcs229_data_compression_type.test b/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test similarity index 100% rename from mtr/basic/t/mcs229_data_compression_type.test rename to mysql-test/columnstore/basic/t/mcs229_data_compression_type.test diff --git a/mtr/basic/t/mcs22_insert_ignore.test b/mysql-test/columnstore/basic/t/mcs22_insert_ignore.test similarity index 100% rename from mtr/basic/t/mcs22_insert_ignore.test rename to mysql-test/columnstore/basic/t/mcs22_insert_ignore.test diff --git a/mtr/basic/t/mcs230_wide_table_600columns.test b/mysql-test/columnstore/basic/t/mcs230_wide_table_600columns.test similarity index 100% rename from mtr/basic/t/mcs230_wide_table_600columns.test rename to mysql-test/columnstore/basic/t/mcs230_wide_table_600columns.test diff --git a/mtr/basic/t/mcs231_reverse_function.test b/mysql-test/columnstore/basic/t/mcs231_reverse_function.test similarity index 100% rename from mtr/basic/t/mcs231_reverse_function.test rename to mysql-test/columnstore/basic/t/mcs231_reverse_function.test diff --git a/mtr/basic/t/mcs232_second_function.test b/mysql-test/columnstore/basic/t/mcs232_second_function.test similarity index 100% rename from mtr/basic/t/mcs232_second_function.test rename to mysql-test/columnstore/basic/t/mcs232_second_function.test diff --git a/mtr/basic/t/mcs233_sec_to_time_function.test b/mysql-test/columnstore/basic/t/mcs233_sec_to_time_function.test similarity index 100% rename from mtr/basic/t/mcs233_sec_to_time_function.test rename to mysql-test/columnstore/basic/t/mcs233_sec_to_time_function.test diff --git a/mtr/basic/t/mcs234_rpad_function.test b/mysql-test/columnstore/basic/t/mcs234_rpad_function.test similarity index 100% rename from mtr/basic/t/mcs234_rpad_function.test rename to mysql-test/columnstore/basic/t/mcs234_rpad_function.test diff --git a/mtr/basic/t/mcs235_lpad_function.test b/mysql-test/columnstore/basic/t/mcs235_lpad_function.test similarity index 100% rename from mtr/basic/t/mcs235_lpad_function.test rename to mysql-test/columnstore/basic/t/mcs235_lpad_function.test diff --git a/mtr/basic/t/mcs236_extract_function.test b/mysql-test/columnstore/basic/t/mcs236_extract_function.test similarity index 100% rename from mtr/basic/t/mcs236_extract_function.test rename to mysql-test/columnstore/basic/t/mcs236_extract_function.test diff --git a/mtr/basic/t/mcs237_exp_function.test b/mysql-test/columnstore/basic/t/mcs237_exp_function.test similarity index 100% rename from mtr/basic/t/mcs237_exp_function.test rename to mysql-test/columnstore/basic/t/mcs237_exp_function.test diff --git a/mtr/basic/t/mcs238_find_in_set_function.test b/mysql-test/columnstore/basic/t/mcs238_find_in_set_function.test similarity index 100% rename from mtr/basic/t/mcs238_find_in_set_function.test rename to mysql-test/columnstore/basic/t/mcs238_find_in_set_function.test diff --git a/mtr/basic/t/mcs239_format_function.test b/mysql-test/columnstore/basic/t/mcs239_format_function.test similarity index 100% rename from mtr/basic/t/mcs239_format_function.test rename to mysql-test/columnstore/basic/t/mcs239_format_function.test diff --git a/mtr/basic/t/mcs23_replace.test b/mysql-test/columnstore/basic/t/mcs23_replace.test similarity index 100% rename from mtr/basic/t/mcs23_replace.test rename to mysql-test/columnstore/basic/t/mcs23_replace.test diff --git a/mtr/basic/t/mcs240_get_format_function.test b/mysql-test/columnstore/basic/t/mcs240_get_format_function.test similarity index 100% rename from mtr/basic/t/mcs240_get_format_function.test rename to mysql-test/columnstore/basic/t/mcs240_get_format_function.test diff --git a/mtr/basic/t/mcs241_not_regexp_function.test b/mysql-test/columnstore/basic/t/mcs241_not_regexp_function.test similarity index 100% rename from mtr/basic/t/mcs241_not_regexp_function.test rename to mysql-test/columnstore/basic/t/mcs241_not_regexp_function.test diff --git a/mtr/basic/t/mcs242_rlike_function.test b/mysql-test/columnstore/basic/t/mcs242_rlike_function.test similarity index 100% rename from mtr/basic/t/mcs242_rlike_function.test rename to mysql-test/columnstore/basic/t/mcs242_rlike_function.test diff --git a/mtr/basic/t/mcs243_not_rlike_function.test b/mysql-test/columnstore/basic/t/mcs243_not_rlike_function.test similarity index 100% rename from mtr/basic/t/mcs243_not_rlike_function.test rename to mysql-test/columnstore/basic/t/mcs243_not_rlike_function.test diff --git a/mtr/basic/t/mcs244_regexp_instr_function.test b/mysql-test/columnstore/basic/t/mcs244_regexp_instr_function.test similarity index 100% rename from mtr/basic/t/mcs244_regexp_instr_function.test rename to mysql-test/columnstore/basic/t/mcs244_regexp_instr_function.test diff --git a/mtr/basic/t/mcs245_regexp_replace_function.test b/mysql-test/columnstore/basic/t/mcs245_regexp_replace_function.test similarity index 100% rename from mtr/basic/t/mcs245_regexp_replace_function.test rename to mysql-test/columnstore/basic/t/mcs245_regexp_replace_function.test diff --git a/mtr/basic/t/mcs246_regexp_substr_function.test b/mysql-test/columnstore/basic/t/mcs246_regexp_substr_function.test similarity index 100% rename from mtr/basic/t/mcs246_regexp_substr_function.test rename to mysql-test/columnstore/basic/t/mcs246_regexp_substr_function.test diff --git a/mtr/basic/t/mcs247_from_unixtime_funtion.test b/mysql-test/columnstore/basic/t/mcs247_from_unixtime_funtion.test similarity index 100% rename from mtr/basic/t/mcs247_from_unixtime_funtion.test rename to mysql-test/columnstore/basic/t/mcs247_from_unixtime_funtion.test diff --git a/mtr/basic/t/mcs248_from_days_function.test b/mysql-test/columnstore/basic/t/mcs248_from_days_function.test similarity index 100% rename from mtr/basic/t/mcs248_from_days_function.test rename to mysql-test/columnstore/basic/t/mcs248_from_days_function.test diff --git a/mtr/basic/t/mcs249_to_days_function.test b/mysql-test/columnstore/basic/t/mcs249_to_days_function.test similarity index 100% rename from mtr/basic/t/mcs249_to_days_function.test rename to mysql-test/columnstore/basic/t/mcs249_to_days_function.test diff --git a/mtr/basic/t/mcs24_insert_from_another_table.test b/mysql-test/columnstore/basic/t/mcs24_insert_from_another_table.test similarity index 100% rename from mtr/basic/t/mcs24_insert_from_another_table.test rename to mysql-test/columnstore/basic/t/mcs24_insert_from_another_table.test diff --git a/mtr/basic/t/mcs250_to_seconds_function.test b/mysql-test/columnstore/basic/t/mcs250_to_seconds_function.test similarity index 100% rename from mtr/basic/t/mcs250_to_seconds_function.test rename to mysql-test/columnstore/basic/t/mcs250_to_seconds_function.test diff --git a/mtr/basic/t/mcs251_time_to_sec_function.test b/mysql-test/columnstore/basic/t/mcs251_time_to_sec_function.test similarity index 100% rename from mtr/basic/t/mcs251_time_to_sec_function.test rename to mysql-test/columnstore/basic/t/mcs251_time_to_sec_function.test diff --git a/mtr/basic/t/mcs252_time_format_function.test b/mysql-test/columnstore/basic/t/mcs252_time_format_function.test similarity index 100% rename from mtr/basic/t/mcs252_time_format_function.test rename to mysql-test/columnstore/basic/t/mcs252_time_format_function.test diff --git a/mtr/basic/t/mcs253_greatest_function.test b/mysql-test/columnstore/basic/t/mcs253_greatest_function.test similarity index 100% rename from mtr/basic/t/mcs253_greatest_function.test rename to mysql-test/columnstore/basic/t/mcs253_greatest_function.test diff --git a/mtr/basic/t/mcs254_hex_function.test b/mysql-test/columnstore/basic/t/mcs254_hex_function.test similarity index 100% rename from mtr/basic/t/mcs254_hex_function.test rename to mysql-test/columnstore/basic/t/mcs254_hex_function.test diff --git a/mtr/basic/t/mcs255_least_function.test b/mysql-test/columnstore/basic/t/mcs255_least_function.test similarity index 100% rename from mtr/basic/t/mcs255_least_function.test rename to mysql-test/columnstore/basic/t/mcs255_least_function.test diff --git a/mtr/basic/t/mcs256_locate_function.test b/mysql-test/columnstore/basic/t/mcs256_locate_function.test similarity index 100% rename from mtr/basic/t/mcs256_locate_function.test rename to mysql-test/columnstore/basic/t/mcs256_locate_function.test diff --git a/mtr/basic/t/mcs257_maketime_function.test b/mysql-test/columnstore/basic/t/mcs257_maketime_function.test similarity index 100% rename from mtr/basic/t/mcs257_maketime_function.test rename to mysql-test/columnstore/basic/t/mcs257_maketime_function.test diff --git a/mtr/basic/t/mcs258_monthname_function.test b/mysql-test/columnstore/basic/t/mcs258_monthname_function.test similarity index 100% rename from mtr/basic/t/mcs258_monthname_function.test rename to mysql-test/columnstore/basic/t/mcs258_monthname_function.test diff --git a/mtr/basic/t/mcs259_instr_function.test b/mysql-test/columnstore/basic/t/mcs259_instr_function.test similarity index 100% rename from mtr/basic/t/mcs259_instr_function.test rename to mysql-test/columnstore/basic/t/mcs259_instr_function.test diff --git a/mtr/basic/t/mcs25_insert_delayed.test b/mysql-test/columnstore/basic/t/mcs25_insert_delayed.test similarity index 100% rename from mtr/basic/t/mcs25_insert_delayed.test rename to mysql-test/columnstore/basic/t/mcs25_insert_delayed.test diff --git a/mtr/basic/t/mcs260_space_function.test b/mysql-test/columnstore/basic/t/mcs260_space_function.test similarity index 100% rename from mtr/basic/t/mcs260_space_function.test rename to mysql-test/columnstore/basic/t/mcs260_space_function.test diff --git a/mtr/basic/t/mcs261_sha_function.test b/mysql-test/columnstore/basic/t/mcs261_sha_function.test similarity index 100% rename from mtr/basic/t/mcs261_sha_function.test rename to mysql-test/columnstore/basic/t/mcs261_sha_function.test diff --git a/mtr/basic/t/mcs262_sha1_function.test b/mysql-test/columnstore/basic/t/mcs262_sha1_function.test similarity index 100% rename from mtr/basic/t/mcs262_sha1_function.test rename to mysql-test/columnstore/basic/t/mcs262_sha1_function.test diff --git a/mtr/basic/t/mcs263_sin_function.test b/mysql-test/columnstore/basic/t/mcs263_sin_function.test similarity index 100% rename from mtr/basic/t/mcs263_sin_function.test rename to mysql-test/columnstore/basic/t/mcs263_sin_function.test diff --git a/mtr/basic/t/mcs264_subdate_function.test b/mysql-test/columnstore/basic/t/mcs264_subdate_function.test similarity index 100% rename from mtr/basic/t/mcs264_subdate_function.test rename to mysql-test/columnstore/basic/t/mcs264_subdate_function.test diff --git a/mtr/basic/t/mcs265_subtime_function.test b/mysql-test/columnstore/basic/t/mcs265_subtime_function.test similarity index 100% rename from mtr/basic/t/mcs265_subtime_function.test rename to mysql-test/columnstore/basic/t/mcs265_subtime_function.test diff --git a/mtr/basic/t/mcs266_str_to_date_function.test b/mysql-test/columnstore/basic/t/mcs266_str_to_date_function.test similarity index 100% rename from mtr/basic/t/mcs266_str_to_date_function.test rename to mysql-test/columnstore/basic/t/mcs266_str_to_date_function.test diff --git a/mtr/basic/t/mcs267_sha2_function.test b/mysql-test/columnstore/basic/t/mcs267_sha2_function.test similarity index 100% rename from mtr/basic/t/mcs267_sha2_function.test rename to mysql-test/columnstore/basic/t/mcs267_sha2_function.test diff --git a/mtr/basic/t/mcs268_compress_function.test b/mysql-test/columnstore/basic/t/mcs268_compress_function.test similarity index 100% rename from mtr/basic/t/mcs268_compress_function.test rename to mysql-test/columnstore/basic/t/mcs268_compress_function.test diff --git a/mtr/basic/t/mcs269_uncompress_function.test b/mysql-test/columnstore/basic/t/mcs269_uncompress_function.test similarity index 100% rename from mtr/basic/t/mcs269_uncompress_function.test rename to mysql-test/columnstore/basic/t/mcs269_uncompress_function.test diff --git a/mtr/basic/t/mcs26_insert_into_view.test b/mysql-test/columnstore/basic/t/mcs26_insert_into_view.test similarity index 100% rename from mtr/basic/t/mcs26_insert_into_view.test rename to mysql-test/columnstore/basic/t/mcs26_insert_into_view.test diff --git a/mtr/basic/t/mcs270_uncompressed_length_function.test b/mysql-test/columnstore/basic/t/mcs270_uncompressed_length_function.test similarity index 100% rename from mtr/basic/t/mcs270_uncompressed_length_function.test rename to mysql-test/columnstore/basic/t/mcs270_uncompressed_length_function.test diff --git a/mtr/basic/t/mcs271_substring_index_function.test b/mysql-test/columnstore/basic/t/mcs271_substring_index_function.test similarity index 100% rename from mtr/basic/t/mcs271_substring_index_function.test rename to mysql-test/columnstore/basic/t/mcs271_substring_index_function.test diff --git a/mtr/basic/t/mcs272_substring_function.test b/mysql-test/columnstore/basic/t/mcs272_substring_function.test similarity index 100% rename from mtr/basic/t/mcs272_substring_function.test rename to mysql-test/columnstore/basic/t/mcs272_substring_function.test diff --git a/mtr/basic/t/mcs273_substr_function.test b/mysql-test/columnstore/basic/t/mcs273_substr_function.test similarity index 100% rename from mtr/basic/t/mcs273_substr_function.test rename to mysql-test/columnstore/basic/t/mcs273_substr_function.test diff --git a/mtr/basic/t/mcs274_time_function.test b/mysql-test/columnstore/basic/t/mcs274_time_function.test similarity index 100% rename from mtr/basic/t/mcs274_time_function.test rename to mysql-test/columnstore/basic/t/mcs274_time_function.test diff --git a/mtr/basic/t/mcs275_timediff_function.test b/mysql-test/columnstore/basic/t/mcs275_timediff_function.test similarity index 100% rename from mtr/basic/t/mcs275_timediff_function.test rename to mysql-test/columnstore/basic/t/mcs275_timediff_function.test diff --git a/mtr/basic/t/mcs276_timestampdiff_function.test b/mysql-test/columnstore/basic/t/mcs276_timestampdiff_function.test similarity index 100% rename from mtr/basic/t/mcs276_timestampdiff_function.test rename to mysql-test/columnstore/basic/t/mcs276_timestampdiff_function.test diff --git a/mtr/basic/t/mcs277_timestampadd_function.test b/mysql-test/columnstore/basic/t/mcs277_timestampadd_function.test similarity index 100% rename from mtr/basic/t/mcs277_timestampadd_function.test rename to mysql-test/columnstore/basic/t/mcs277_timestampadd_function.test diff --git a/mtr/basic/t/mcs278_weekday_function.test b/mysql-test/columnstore/basic/t/mcs278_weekday_function.test similarity index 100% rename from mtr/basic/t/mcs278_weekday_function.test rename to mysql-test/columnstore/basic/t/mcs278_weekday_function.test diff --git a/mtr/basic/t/mcs279_week_function.test b/mysql-test/columnstore/basic/t/mcs279_week_function.test similarity index 100% rename from mtr/basic/t/mcs279_week_function.test rename to mysql-test/columnstore/basic/t/mcs279_week_function.test diff --git a/mtr/basic/t/mcs27_insert_on_duplicate_update.test b/mysql-test/columnstore/basic/t/mcs27_insert_on_duplicate_update.test similarity index 100% rename from mtr/basic/t/mcs27_insert_on_duplicate_update.test rename to mysql-test/columnstore/basic/t/mcs27_insert_on_duplicate_update.test diff --git a/mtr/basic/t/mcs280_weekofyear_function.test b/mysql-test/columnstore/basic/t/mcs280_weekofyear_function.test similarity index 100% rename from mtr/basic/t/mcs280_weekofyear_function.test rename to mysql-test/columnstore/basic/t/mcs280_weekofyear_function.test diff --git a/mtr/basic/t/mcs281_year_function.test b/mysql-test/columnstore/basic/t/mcs281_year_function.test similarity index 100% rename from mtr/basic/t/mcs281_year_function.test rename to mysql-test/columnstore/basic/t/mcs281_year_function.test diff --git a/mtr/basic/t/mcs282_yearweek_function.test b/mysql-test/columnstore/basic/t/mcs282_yearweek_function.test similarity index 100% rename from mtr/basic/t/mcs282_yearweek_function.test rename to mysql-test/columnstore/basic/t/mcs282_yearweek_function.test diff --git a/mtr/basic/t/mcs283_last_day_function.test b/mysql-test/columnstore/basic/t/mcs283_last_day_function.test similarity index 100% rename from mtr/basic/t/mcs283_last_day_function.test rename to mysql-test/columnstore/basic/t/mcs283_last_day_function.test diff --git a/mtr/basic/t/mcs284_hour_function.test b/mysql-test/columnstore/basic/t/mcs284_hour_function.test similarity index 100% rename from mtr/basic/t/mcs284_hour_function.test rename to mysql-test/columnstore/basic/t/mcs284_hour_function.test diff --git a/mtr/basic/t/mcs285_right_function.test b/mysql-test/columnstore/basic/t/mcs285_right_function.test similarity index 100% rename from mtr/basic/t/mcs285_right_function.test rename to mysql-test/columnstore/basic/t/mcs285_right_function.test diff --git a/mtr/basic/t/mcs286_left_function.test b/mysql-test/columnstore/basic/t/mcs286_left_function.test similarity index 100% rename from mtr/basic/t/mcs286_left_function.test rename to mysql-test/columnstore/basic/t/mcs286_left_function.test diff --git a/mtr/basic/t/mcs28_load_data_local_infile.test b/mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test similarity index 100% rename from mtr/basic/t/mcs28_load_data_local_infile.test rename to mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test diff --git a/mtr/basic/t/mcs29_load_data_local_infile_negative.test b/mysql-test/columnstore/basic/t/mcs29_load_data_local_infile_negative.test similarity index 100% rename from mtr/basic/t/mcs29_load_data_local_infile_negative.test rename to mysql-test/columnstore/basic/t/mcs29_load_data_local_infile_negative.test diff --git a/mtr/basic/t/mcs2_create_table_valid_names.test b/mysql-test/columnstore/basic/t/mcs2_create_table_valid_names.test similarity index 100% rename from mtr/basic/t/mcs2_create_table_valid_names.test rename to mysql-test/columnstore/basic/t/mcs2_create_table_valid_names.test diff --git a/mtr/basic/t/mcs30_update_table.test b/mysql-test/columnstore/basic/t/mcs30_update_table.test similarity index 100% rename from mtr/basic/t/mcs30_update_table.test rename to mysql-test/columnstore/basic/t/mcs30_update_table.test diff --git a/mtr/basic/t/mcs31_update_table_negative.test b/mysql-test/columnstore/basic/t/mcs31_update_table_negative.test similarity index 100% rename from mtr/basic/t/mcs31_update_table_negative.test rename to mysql-test/columnstore/basic/t/mcs31_update_table_negative.test diff --git a/mtr/basic/t/mcs32_delete_table.test b/mysql-test/columnstore/basic/t/mcs32_delete_table.test similarity index 100% rename from mtr/basic/t/mcs32_delete_table.test rename to mysql-test/columnstore/basic/t/mcs32_delete_table.test diff --git a/mtr/basic/t/mcs33_select_basic.test b/mysql-test/columnstore/basic/t/mcs33_select_basic.test similarity index 100% rename from mtr/basic/t/mcs33_select_basic.test rename to mysql-test/columnstore/basic/t/mcs33_select_basic.test diff --git a/mtr/basic/t/mcs34_select_order_by.test b/mysql-test/columnstore/basic/t/mcs34_select_order_by.test similarity index 100% rename from mtr/basic/t/mcs34_select_order_by.test rename to mysql-test/columnstore/basic/t/mcs34_select_order_by.test diff --git a/mtr/basic/t/mcs35_select_group_by.test b/mysql-test/columnstore/basic/t/mcs35_select_group_by.test similarity index 100% rename from mtr/basic/t/mcs35_select_group_by.test rename to mysql-test/columnstore/basic/t/mcs35_select_group_by.test diff --git a/mtr/basic/t/mcs36_select_order_by_group_by.test b/mysql-test/columnstore/basic/t/mcs36_select_order_by_group_by.test similarity index 100% rename from mtr/basic/t/mcs36_select_order_by_group_by.test rename to mysql-test/columnstore/basic/t/mcs36_select_order_by_group_by.test diff --git a/mtr/basic/t/mcs37_select_distinct.test b/mysql-test/columnstore/basic/t/mcs37_select_distinct.test similarity index 100% rename from mtr/basic/t/mcs37_select_distinct.test rename to mysql-test/columnstore/basic/t/mcs37_select_distinct.test diff --git a/mtr/basic/t/mcs38_select_limit.test b/mysql-test/columnstore/basic/t/mcs38_select_limit.test similarity index 100% rename from mtr/basic/t/mcs38_select_limit.test rename to mysql-test/columnstore/basic/t/mcs38_select_limit.test diff --git a/mtr/basic/t/mcs39_select_function_calls.test b/mysql-test/columnstore/basic/t/mcs39_select_function_calls.test similarity index 100% rename from mtr/basic/t/mcs39_select_function_calls.test rename to mysql-test/columnstore/basic/t/mcs39_select_function_calls.test diff --git a/mtr/basic/t/mcs3_create_table_charset_collations.test b/mysql-test/columnstore/basic/t/mcs3_create_table_charset_collations.test similarity index 100% rename from mtr/basic/t/mcs3_create_table_charset_collations.test rename to mysql-test/columnstore/basic/t/mcs3_create_table_charset_collations.test diff --git a/mtr/basic/t/mcs40_select_expressions.test b/mysql-test/columnstore/basic/t/mcs40_select_expressions.test similarity index 100% rename from mtr/basic/t/mcs40_select_expressions.test rename to mysql-test/columnstore/basic/t/mcs40_select_expressions.test diff --git a/mtr/basic/t/mcs41_select_joins.test b/mysql-test/columnstore/basic/t/mcs41_select_joins.test similarity index 100% rename from mtr/basic/t/mcs41_select_joins.test rename to mysql-test/columnstore/basic/t/mcs41_select_joins.test diff --git a/mtr/basic/t/mcs42_select_precision.test b/mysql-test/columnstore/basic/t/mcs42_select_precision.test similarity index 100% rename from mtr/basic/t/mcs42_select_precision.test rename to mysql-test/columnstore/basic/t/mcs42_select_precision.test diff --git a/mtr/basic/t/mcs44_select_crossengine_join.test b/mysql-test/columnstore/basic/t/mcs44_select_crossengine_join.test similarity index 100% rename from mtr/basic/t/mcs44_select_crossengine_join.test rename to mysql-test/columnstore/basic/t/mcs44_select_crossengine_join.test diff --git a/mtr/basic/t/mcs45_write_crossengine_join.test b/mysql-test/columnstore/basic/t/mcs45_write_crossengine_join.test similarity index 100% rename from mtr/basic/t/mcs45_write_crossengine_join.test rename to mysql-test/columnstore/basic/t/mcs45_write_crossengine_join.test diff --git a/mtr/basic/t/mcs47_cpimport_central_loc_sin_source.test b/mysql-test/columnstore/basic/t/mcs47_cpimport_central_loc_sin_source.test similarity index 100% rename from mtr/basic/t/mcs47_cpimport_central_loc_sin_source.test rename to mysql-test/columnstore/basic/t/mcs47_cpimport_central_loc_sin_source.test diff --git a/mtr/basic/t/mcs48_cpimport_central_loc_dist_source.test b/mysql-test/columnstore/basic/t/mcs48_cpimport_central_loc_dist_source.test similarity index 100% rename from mtr/basic/t/mcs48_cpimport_central_loc_dist_source.test rename to mysql-test/columnstore/basic/t/mcs48_cpimport_central_loc_dist_source.test diff --git a/mtr/basic/t/mcs49_cpimport_parallel_dist.test b/mysql-test/columnstore/basic/t/mcs49_cpimport_parallel_dist.test similarity index 100% rename from mtr/basic/t/mcs49_cpimport_parallel_dist.test rename to mysql-test/columnstore/basic/t/mcs49_cpimport_parallel_dist.test diff --git a/mtr/basic/t/mcs4_create_table_defined_values.test b/mysql-test/columnstore/basic/t/mcs4_create_table_defined_values.test similarity index 100% rename from mtr/basic/t/mcs4_create_table_defined_values.test rename to mysql-test/columnstore/basic/t/mcs4_create_table_defined_values.test diff --git a/mtr/basic/t/mcs50_cpimport_stdin.test b/mysql-test/columnstore/basic/t/mcs50_cpimport_stdin.test similarity index 100% rename from mtr/basic/t/mcs50_cpimport_stdin.test rename to mysql-test/columnstore/basic/t/mcs50_cpimport_stdin.test diff --git a/mtr/basic/t/mcs51_cpimport_select_from.test b/mysql-test/columnstore/basic/t/mcs51_cpimport_select_from.test similarity index 100% rename from mtr/basic/t/mcs51_cpimport_select_from.test rename to mysql-test/columnstore/basic/t/mcs51_cpimport_select_from.test diff --git a/mtr/basic/t/mcs55_cpimport_binary_source.test b/mysql-test/columnstore/basic/t/mcs55_cpimport_binary_source.test similarity index 100% rename from mtr/basic/t/mcs55_cpimport_binary_source.test rename to mysql-test/columnstore/basic/t/mcs55_cpimport_binary_source.test diff --git a/mtr/basic/t/mcs56_cpimport_negative.test b/mysql-test/columnstore/basic/t/mcs56_cpimport_negative.test similarity index 100% rename from mtr/basic/t/mcs56_cpimport_negative.test rename to mysql-test/columnstore/basic/t/mcs56_cpimport_negative.test diff --git a/mtr/basic/t/mcs57_autoincrement.test b/mysql-test/columnstore/basic/t/mcs57_autoincrement.test similarity index 100% rename from mtr/basic/t/mcs57_autoincrement.test rename to mysql-test/columnstore/basic/t/mcs57_autoincrement.test diff --git a/mtr/basic/t/mcs59_nonscalar_datatypes.test b/mysql-test/columnstore/basic/t/mcs59_nonscalar_datatypes.test similarity index 100% rename from mtr/basic/t/mcs59_nonscalar_datatypes.test rename to mysql-test/columnstore/basic/t/mcs59_nonscalar_datatypes.test diff --git a/mtr/basic/t/mcs5_create_table_from_other_tables.test b/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test similarity index 100% rename from mtr/basic/t/mcs5_create_table_from_other_tables.test rename to mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test diff --git a/mtr/basic/t/mcs60_trigger.test b/mysql-test/columnstore/basic/t/mcs60_trigger.test similarity index 100% rename from mtr/basic/t/mcs60_trigger.test rename to mysql-test/columnstore/basic/t/mcs60_trigger.test diff --git a/mtr/basic/t/mcs62_binary_datatypes.test b/mysql-test/columnstore/basic/t/mcs62_binary_datatypes.test similarity index 100% rename from mtr/basic/t/mcs62_binary_datatypes.test rename to mysql-test/columnstore/basic/t/mcs62_binary_datatypes.test diff --git a/mtr/basic/t/mcs63_crossengine_views.test b/mysql-test/columnstore/basic/t/mcs63_crossengine_views.test similarity index 100% rename from mtr/basic/t/mcs63_crossengine_views.test rename to mysql-test/columnstore/basic/t/mcs63_crossengine_views.test diff --git a/mtr/basic/t/mcs64_crossengine_group_by.test b/mysql-test/columnstore/basic/t/mcs64_crossengine_group_by.test similarity index 100% rename from mtr/basic/t/mcs64_crossengine_group_by.test rename to mysql-test/columnstore/basic/t/mcs64_crossengine_group_by.test diff --git a/mtr/basic/t/mcs65_crossengine_order_by.test b/mysql-test/columnstore/basic/t/mcs65_crossengine_order_by.test similarity index 100% rename from mtr/basic/t/mcs65_crossengine_order_by.test rename to mysql-test/columnstore/basic/t/mcs65_crossengine_order_by.test diff --git a/mtr/basic/t/mcs67_ldi_datafile_separators.test b/mysql-test/columnstore/basic/t/mcs67_ldi_datafile_separators.test similarity index 100% rename from mtr/basic/t/mcs67_ldi_datafile_separators.test rename to mysql-test/columnstore/basic/t/mcs67_ldi_datafile_separators.test diff --git a/mtr/basic/t/mcs68_cpimport_datafile_separators.test b/mysql-test/columnstore/basic/t/mcs68_cpimport_datafile_separators.test similarity index 100% rename from mtr/basic/t/mcs68_cpimport_datafile_separators.test rename to mysql-test/columnstore/basic/t/mcs68_cpimport_datafile_separators.test diff --git a/mtr/basic/t/mcs69_cast_data_types.test b/mysql-test/columnstore/basic/t/mcs69_cast_data_types.test similarity index 100% rename from mtr/basic/t/mcs69_cast_data_types.test rename to mysql-test/columnstore/basic/t/mcs69_cast_data_types.test diff --git a/mtr/basic/t/mcs70_cast_date_time.test b/mysql-test/columnstore/basic/t/mcs70_cast_date_time.test similarity index 100% rename from mtr/basic/t/mcs70_cast_date_time.test rename to mysql-test/columnstore/basic/t/mcs70_cast_date_time.test diff --git a/mtr/basic/t/mcs71_crossengine_where_groupby_orderby_limit.test b/mysql-test/columnstore/basic/t/mcs71_crossengine_where_groupby_orderby_limit.test similarity index 100% rename from mtr/basic/t/mcs71_crossengine_where_groupby_orderby_limit.test rename to mysql-test/columnstore/basic/t/mcs71_crossengine_where_groupby_orderby_limit.test diff --git a/mtr/basic/t/mcs73_indexes_keys.test b/mysql-test/columnstore/basic/t/mcs73_indexes_keys.test similarity index 100% rename from mtr/basic/t/mcs73_indexes_keys.test rename to mysql-test/columnstore/basic/t/mcs73_indexes_keys.test diff --git a/mtr/basic/t/mcs74_check_constraint.test b/mysql-test/columnstore/basic/t/mcs74_check_constraint.test similarity index 100% rename from mtr/basic/t/mcs74_check_constraint.test rename to mysql-test/columnstore/basic/t/mcs74_check_constraint.test diff --git a/mtr/basic/t/mcs75_generated_columns.test b/mysql-test/columnstore/basic/t/mcs75_generated_columns.test similarity index 100% rename from mtr/basic/t/mcs75_generated_columns.test rename to mysql-test/columnstore/basic/t/mcs75_generated_columns.test diff --git a/mtr/basic/t/mcs76_having.test b/mysql-test/columnstore/basic/t/mcs76_having.test similarity index 100% rename from mtr/basic/t/mcs76_having.test rename to mysql-test/columnstore/basic/t/mcs76_having.test diff --git a/mtr/basic/t/mcs77_where_conditions.test b/mysql-test/columnstore/basic/t/mcs77_where_conditions.test similarity index 100% rename from mtr/basic/t/mcs77_where_conditions.test rename to mysql-test/columnstore/basic/t/mcs77_where_conditions.test diff --git a/mtr/basic/t/mcs78_aliases.test b/mysql-test/columnstore/basic/t/mcs78_aliases.test similarity index 100% rename from mtr/basic/t/mcs78_aliases.test rename to mysql-test/columnstore/basic/t/mcs78_aliases.test diff --git a/mtr/basic/t/mcs79_exists.test b/mysql-test/columnstore/basic/t/mcs79_exists.test similarity index 100% rename from mtr/basic/t/mcs79_exists.test rename to mysql-test/columnstore/basic/t/mcs79_exists.test diff --git a/mtr/basic/t/mcs7_create_table_with_metadata.test b/mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test similarity index 100% rename from mtr/basic/t/mcs7_create_table_with_metadata.test rename to mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test diff --git a/mtr/basic/t/mcs80_set_operations.test b/mysql-test/columnstore/basic/t/mcs80_set_operations.test similarity index 100% rename from mtr/basic/t/mcs80_set_operations.test rename to mysql-test/columnstore/basic/t/mcs80_set_operations.test diff --git a/mtr/basic/t/mcs81_self_join.test b/mysql-test/columnstore/basic/t/mcs81_self_join.test similarity index 100% rename from mtr/basic/t/mcs81_self_join.test rename to mysql-test/columnstore/basic/t/mcs81_self_join.test diff --git a/mtr/basic/t/mcs82_update_join.test b/mysql-test/columnstore/basic/t/mcs82_update_join.test similarity index 100% rename from mtr/basic/t/mcs82_update_join.test rename to mysql-test/columnstore/basic/t/mcs82_update_join.test diff --git a/mtr/basic/t/mcs83_delete_join.test b/mysql-test/columnstore/basic/t/mcs83_delete_join.test similarity index 100% rename from mtr/basic/t/mcs83_delete_join.test rename to mysql-test/columnstore/basic/t/mcs83_delete_join.test diff --git a/mtr/basic/t/mcs84_rollup.test b/mysql-test/columnstore/basic/t/mcs84_rollup.test similarity index 100% rename from mtr/basic/t/mcs84_rollup.test rename to mysql-test/columnstore/basic/t/mcs84_rollup.test diff --git a/mtr/basic/t/mcs85_derived_table.test b/mysql-test/columnstore/basic/t/mcs85_derived_table.test similarity index 100% rename from mtr/basic/t/mcs85_derived_table.test rename to mysql-test/columnstore/basic/t/mcs85_derived_table.test diff --git a/mtr/basic/t/mcs87_alter_column.test b/mysql-test/columnstore/basic/t/mcs87_alter_column.test similarity index 100% rename from mtr/basic/t/mcs87_alter_column.test rename to mysql-test/columnstore/basic/t/mcs87_alter_column.test diff --git a/mtr/basic/t/mcs88_import_export_csv.test b/mysql-test/columnstore/basic/t/mcs88_import_export_csv.test similarity index 100% rename from mtr/basic/t/mcs88_import_export_csv.test rename to mysql-test/columnstore/basic/t/mcs88_import_export_csv.test diff --git a/mtr/basic/t/mcs89_drop_table_restrict.test b/mysql-test/columnstore/basic/t/mcs89_drop_table_restrict.test similarity index 100% rename from mtr/basic/t/mcs89_drop_table_restrict.test rename to mysql-test/columnstore/basic/t/mcs89_drop_table_restrict.test diff --git a/mtr/basic/t/mcs8_create_table_with_constraints.test b/mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test similarity index 100% rename from mtr/basic/t/mcs8_create_table_with_constraints.test rename to mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test diff --git a/mtr/basic/t/mcs90_aggregate_functions.test b/mysql-test/columnstore/basic/t/mcs90_aggregate_functions.test similarity index 100% rename from mtr/basic/t/mcs90_aggregate_functions.test rename to mysql-test/columnstore/basic/t/mcs90_aggregate_functions.test diff --git a/mtr/basic/t/mcs91_comparison_functions.test b/mysql-test/columnstore/basic/t/mcs91_comparison_functions.test similarity index 100% rename from mtr/basic/t/mcs91_comparison_functions.test rename to mysql-test/columnstore/basic/t/mcs91_comparison_functions.test diff --git a/mtr/basic/t/mcs92_date_functions.test b/mysql-test/columnstore/basic/t/mcs92_date_functions.test similarity index 100% rename from mtr/basic/t/mcs92_date_functions.test rename to mysql-test/columnstore/basic/t/mcs92_date_functions.test diff --git a/mtr/basic/t/mcs93_string_functions.test b/mysql-test/columnstore/basic/t/mcs93_string_functions.test similarity index 100% rename from mtr/basic/t/mcs93_string_functions.test rename to mysql-test/columnstore/basic/t/mcs93_string_functions.test diff --git a/mtr/basic/t/mcs94_math_functions.test b/mysql-test/columnstore/basic/t/mcs94_math_functions.test similarity index 100% rename from mtr/basic/t/mcs94_math_functions.test rename to mysql-test/columnstore/basic/t/mcs94_math_functions.test diff --git a/mtr/basic/t/mcs95_variance_functions.test b/mysql-test/columnstore/basic/t/mcs95_variance_functions.test similarity index 100% rename from mtr/basic/t/mcs95_variance_functions.test rename to mysql-test/columnstore/basic/t/mcs95_variance_functions.test diff --git a/mtr/basic/t/mcs96_std_deviation_functions.test b/mysql-test/columnstore/basic/t/mcs96_std_deviation_functions.test similarity index 100% rename from mtr/basic/t/mcs96_std_deviation_functions.test rename to mysql-test/columnstore/basic/t/mcs96_std_deviation_functions.test diff --git a/mtr/basic/t/mcs97_group_concat.test b/mysql-test/columnstore/basic/t/mcs97_group_concat.test similarity index 100% rename from mtr/basic/t/mcs97_group_concat.test rename to mysql-test/columnstore/basic/t/mcs97_group_concat.test diff --git a/mtr/basic/t/mcs9_create_table_negative.test b/mysql-test/columnstore/basic/t/mcs9_create_table_negative.test similarity index 100% rename from mtr/basic/t/mcs9_create_table_negative.test rename to mysql-test/columnstore/basic/t/mcs9_create_table_negative.test diff --git a/mtr/basic/t/type_decimal.test b/mysql-test/columnstore/basic/t/type_decimal.test similarity index 100% rename from mtr/basic/t/type_decimal.test rename to mysql-test/columnstore/basic/t/type_decimal.test diff --git a/mtr/basic/t/type_uint64.test b/mysql-test/columnstore/basic/t/type_uint64.test similarity index 100% rename from mtr/basic/t/type_uint64.test rename to mysql-test/columnstore/basic/t/type_uint64.test diff --git a/mtr/basic/t/udf_calshowpartitions.test b/mysql-test/columnstore/basic/t/udf_calshowpartitions.test similarity index 100% rename from mtr/basic/t/udf_calshowpartitions.test rename to mysql-test/columnstore/basic/t/udf_calshowpartitions.test diff --git a/mtr/basic/t/unsigned_aggregate.test b/mysql-test/columnstore/basic/t/unsigned_aggregate.test similarity index 100% rename from mtr/basic/t/unsigned_aggregate.test rename to mysql-test/columnstore/basic/t/unsigned_aggregate.test diff --git a/mtr/basic/t/unsigned_basic.test b/mysql-test/columnstore/basic/t/unsigned_basic.test similarity index 100% rename from mtr/basic/t/unsigned_basic.test rename to mysql-test/columnstore/basic/t/unsigned_basic.test diff --git a/mtr/basic/t/unsigned_bitop.test b/mysql-test/columnstore/basic/t/unsigned_bitop.test similarity index 100% rename from mtr/basic/t/unsigned_bitop.test rename to mysql-test/columnstore/basic/t/unsigned_bitop.test diff --git a/mtr/basic/t/unsigned_bug5628.test b/mysql-test/columnstore/basic/t/unsigned_bug5628.test similarity index 100% rename from mtr/basic/t/unsigned_bug5628.test rename to mysql-test/columnstore/basic/t/unsigned_bug5628.test diff --git a/mtr/basic/t/unsigned_bug5712.test b/mysql-test/columnstore/basic/t/unsigned_bug5712.test similarity index 100% rename from mtr/basic/t/unsigned_bug5712.test rename to mysql-test/columnstore/basic/t/unsigned_bug5712.test diff --git a/mtr/basic/t/unsigned_greatest.test b/mysql-test/columnstore/basic/t/unsigned_greatest.test similarity index 100% rename from mtr/basic/t/unsigned_greatest.test rename to mysql-test/columnstore/basic/t/unsigned_greatest.test diff --git a/mtr/basic/t/unsigned_joins.test b/mysql-test/columnstore/basic/t/unsigned_joins.test similarity index 100% rename from mtr/basic/t/unsigned_joins.test rename to mysql-test/columnstore/basic/t/unsigned_joins.test diff --git a/mtr/basic/t/unsigned_least.test b/mysql-test/columnstore/basic/t/unsigned_least.test similarity index 100% rename from mtr/basic/t/unsigned_least.test rename to mysql-test/columnstore/basic/t/unsigned_least.test diff --git a/mtr/basic/t/unsigned_math.test b/mysql-test/columnstore/basic/t/unsigned_math.test similarity index 100% rename from mtr/basic/t/unsigned_math.test rename to mysql-test/columnstore/basic/t/unsigned_math.test diff --git a/mtr/bugfixes/README b/mysql-test/columnstore/bugfixes/README similarity index 100% rename from mtr/bugfixes/README rename to mysql-test/columnstore/bugfixes/README diff --git a/mtr/bugfixes/mcol-3785.result b/mysql-test/columnstore/bugfixes/mcol-3785.result similarity index 100% rename from mtr/bugfixes/mcol-3785.result rename to mysql-test/columnstore/bugfixes/mcol-3785.result diff --git a/mtr/bugfixes/mcol-3785.test b/mysql-test/columnstore/bugfixes/mcol-3785.test similarity index 100% rename from mtr/bugfixes/mcol-3785.test rename to mysql-test/columnstore/bugfixes/mcol-3785.test diff --git a/mtr/bugfixes/mcol-4412.result b/mysql-test/columnstore/bugfixes/mcol-4412.result similarity index 100% rename from mtr/bugfixes/mcol-4412.result rename to mysql-test/columnstore/bugfixes/mcol-4412.result diff --git a/mtr/bugfixes/mcol-4412.test b/mysql-test/columnstore/bugfixes/mcol-4412.test similarity index 100% rename from mtr/bugfixes/mcol-4412.test rename to mysql-test/columnstore/bugfixes/mcol-4412.test diff --git a/mtr/bugfixes/mcol-4453-4455.result b/mysql-test/columnstore/bugfixes/mcol-4453-4455.result similarity index 100% rename from mtr/bugfixes/mcol-4453-4455.result rename to mysql-test/columnstore/bugfixes/mcol-4453-4455.result diff --git a/mtr/bugfixes/mcol-4453-4455.test b/mysql-test/columnstore/bugfixes/mcol-4453-4455.test similarity index 100% rename from mtr/bugfixes/mcol-4453-4455.test rename to mysql-test/columnstore/bugfixes/mcol-4453-4455.test diff --git a/mtr/bugfixes/mcol-4493.result b/mysql-test/columnstore/bugfixes/mcol-4493.result similarity index 100% rename from mtr/bugfixes/mcol-4493.result rename to mysql-test/columnstore/bugfixes/mcol-4493.result diff --git a/mtr/bugfixes/mcol-4493.test b/mysql-test/columnstore/bugfixes/mcol-4493.test similarity index 100% rename from mtr/bugfixes/mcol-4493.test rename to mysql-test/columnstore/bugfixes/mcol-4493.test diff --git a/mtr/bugfixes/mcol-4505.result b/mysql-test/columnstore/bugfixes/mcol-4505.result similarity index 100% rename from mtr/bugfixes/mcol-4505.result rename to mysql-test/columnstore/bugfixes/mcol-4505.result diff --git a/mtr/bugfixes/mcol-4505.test b/mysql-test/columnstore/bugfixes/mcol-4505.test similarity index 100% rename from mtr/bugfixes/mcol-4505.test rename to mysql-test/columnstore/bugfixes/mcol-4505.test diff --git a/mtr/bugfixes/mcol_4222.result b/mysql-test/columnstore/bugfixes/mcol_4222.result similarity index 100% rename from mtr/bugfixes/mcol_4222.result rename to mysql-test/columnstore/bugfixes/mcol_4222.result diff --git a/mtr/bugfixes/mcol_4222.test b/mysql-test/columnstore/bugfixes/mcol_4222.test similarity index 100% rename from mtr/bugfixes/mcol_4222.test rename to mysql-test/columnstore/bugfixes/mcol_4222.test diff --git a/mtr/bugfixes/mcol_4465.result b/mysql-test/columnstore/bugfixes/mcol_4465.result similarity index 100% rename from mtr/bugfixes/mcol_4465.result rename to mysql-test/columnstore/bugfixes/mcol_4465.result diff --git a/mtr/bugfixes/mcol_4465.test b/mysql-test/columnstore/bugfixes/mcol_4465.test similarity index 100% rename from mtr/bugfixes/mcol_4465.test rename to mysql-test/columnstore/bugfixes/mcol_4465.test diff --git a/mtr/csinternal/README b/mysql-test/columnstore/csinternal/README similarity index 100% rename from mtr/csinternal/README rename to mysql-test/columnstore/csinternal/README diff --git a/mtr/csinternal/devregression/README b/mysql-test/columnstore/csinternal/devregression/README similarity index 100% rename from mtr/csinternal/devregression/README rename to mysql-test/columnstore/csinternal/devregression/README diff --git a/mtr/csinternal/devregression/r/mcs7000_regression_bug1632.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7000_regression_bug1632.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7000_regression_bug1632.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7000_regression_bug1632.result diff --git a/mtr/csinternal/devregression/r/mcs7001_regression_bug1796.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7001_regression_bug1796.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7001_regression_bug1796.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7001_regression_bug1796.result diff --git a/mtr/csinternal/devregression/r/mcs7002_regression_bug1903.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7002_regression_bug1903.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7002_regression_bug1903.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7002_regression_bug1903.result diff --git a/mtr/csinternal/devregression/r/mcs7003_regression_bug2549.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7003_regression_bug2549.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7003_regression_bug2549.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7003_regression_bug2549.result diff --git a/mtr/csinternal/devregression/r/mcs7004_regression_bug2577.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7004_regression_bug2577.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7004_regression_bug2577.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7004_regression_bug2577.result diff --git a/mtr/csinternal/devregression/r/mcs7005_regression_bug2589.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7005_regression_bug2589.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7005_regression_bug2589.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7005_regression_bug2589.result diff --git a/mtr/csinternal/devregression/r/mcs7006_regression_bug2595.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7006_regression_bug2595.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7006_regression_bug2595.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7006_regression_bug2595.result diff --git a/mtr/csinternal/devregression/r/mcs7007_regression_bug2657.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7007_regression_bug2657.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7007_regression_bug2657.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7007_regression_bug2657.result diff --git a/mtr/csinternal/devregression/r/mcs7008_regression_bug2712.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7008_regression_bug2712.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7008_regression_bug2712.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7008_regression_bug2712.result diff --git a/mtr/csinternal/devregression/r/mcs7009_regression_bug2732.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7009_regression_bug2732.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7009_regression_bug2732.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7009_regression_bug2732.result diff --git a/mtr/csinternal/devregression/r/mcs7010_regression_bug2741.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7010_regression_bug2741.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7010_regression_bug2741.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7010_regression_bug2741.result diff --git a/mtr/csinternal/devregression/r/mcs7011_regression_bug2762.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7011_regression_bug2762.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7011_regression_bug2762.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7011_regression_bug2762.result diff --git a/mtr/csinternal/devregression/r/mcs7012_regression_bug2788.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7012_regression_bug2788.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7012_regression_bug2788.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7012_regression_bug2788.result diff --git a/mtr/csinternal/devregression/r/mcs7013_regression_bug2810.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7013_regression_bug2810.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7013_regression_bug2810.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7013_regression_bug2810.result diff --git a/mtr/csinternal/devregression/r/mcs7014_regression_bug2813.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7014_regression_bug2813.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7014_regression_bug2813.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7014_regression_bug2813.result diff --git a/mtr/csinternal/devregression/r/mcs7015_regression_bug2835.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7015_regression_bug2835.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7015_regression_bug2835.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7015_regression_bug2835.result diff --git a/mtr/csinternal/devregression/r/mcs7016_regression_bug2838.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7016_regression_bug2838.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7016_regression_bug2838.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7016_regression_bug2838.result diff --git a/mtr/csinternal/devregression/r/mcs7017_regression_bug2845.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7017_regression_bug2845.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7017_regression_bug2845.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7017_regression_bug2845.result diff --git a/mtr/csinternal/devregression/r/mcs7018_regression_bug2873.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7018_regression_bug2873.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7018_regression_bug2873.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7018_regression_bug2873.result diff --git a/mtr/csinternal/devregression/r/mcs7019_regression_bug2876.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7019_regression_bug2876.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7019_regression_bug2876.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7019_regression_bug2876.result diff --git a/mtr/csinternal/devregression/r/mcs7020_regression_bug2884.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7020_regression_bug2884.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7020_regression_bug2884.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7020_regression_bug2884.result diff --git a/mtr/csinternal/devregression/r/mcs7021_regression_bug2892.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7021_regression_bug2892.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7021_regression_bug2892.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7021_regression_bug2892.result diff --git a/mtr/csinternal/devregression/r/mcs7022_regression_bug2907.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7022_regression_bug2907.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7022_regression_bug2907.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7022_regression_bug2907.result diff --git a/mtr/csinternal/devregression/r/mcs7023_regression_bug2909.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7023_regression_bug2909.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7023_regression_bug2909.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7023_regression_bug2909.result diff --git a/mtr/csinternal/devregression/r/mcs7024_regression_bug2911_negative.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7024_regression_bug2911_negative.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7024_regression_bug2911_negative.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7024_regression_bug2911_negative.result diff --git a/mtr/csinternal/devregression/r/mcs7025_regression_bug2912.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7025_regression_bug2912.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7025_regression_bug2912.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7025_regression_bug2912.result diff --git a/mtr/csinternal/devregression/r/mcs7026_regression_bug2915.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7026_regression_bug2915.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7026_regression_bug2915.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7026_regression_bug2915.result diff --git a/mtr/csinternal/devregression/r/mcs7027_regression_bug2919.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7027_regression_bug2919.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7027_regression_bug2919.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7027_regression_bug2919.result diff --git a/mtr/csinternal/devregression/r/mcs7028_regression_bug2922.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7028_regression_bug2922.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7028_regression_bug2922.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7028_regression_bug2922.result diff --git a/mtr/csinternal/devregression/r/mcs7029_regression_bug2924.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7029_regression_bug2924.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7029_regression_bug2924.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7029_regression_bug2924.result diff --git a/mtr/csinternal/devregression/r/mcs7030_regression_bug2928.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7030_regression_bug2928.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7030_regression_bug2928.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7030_regression_bug2928.result diff --git a/mtr/csinternal/devregression/r/mcs7031_regression_bug2932.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7031_regression_bug2932.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7031_regression_bug2932.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7031_regression_bug2932.result diff --git a/mtr/csinternal/devregression/r/mcs7032_regression_bug2938.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7032_regression_bug2938.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7032_regression_bug2938.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7032_regression_bug2938.result diff --git a/mtr/csinternal/devregression/r/mcs7033_regression_bug2954.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7033_regression_bug2954.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7033_regression_bug2954.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7033_regression_bug2954.result diff --git a/mtr/csinternal/devregression/r/mcs7034_regression_bug2961.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7034_regression_bug2961.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7034_regression_bug2961.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7034_regression_bug2961.result diff --git a/mtr/csinternal/devregression/r/mcs7035_regression_bug2976.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7035_regression_bug2976.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7035_regression_bug2976.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7035_regression_bug2976.result diff --git a/mtr/csinternal/devregression/r/mcs7036_regression_bug2992.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7036_regression_bug2992.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7036_regression_bug2992.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7036_regression_bug2992.result diff --git a/mtr/csinternal/devregression/r/mcs7037_regression_bug3002.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7037_regression_bug3002.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7037_regression_bug3002.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7037_regression_bug3002.result diff --git a/mtr/csinternal/devregression/r/mcs7038_regression_bug3003.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7038_regression_bug3003.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7038_regression_bug3003.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7038_regression_bug3003.result diff --git a/mtr/csinternal/devregression/r/mcs7039_regression_bug3007.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7039_regression_bug3007.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7039_regression_bug3007.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7039_regression_bug3007.result diff --git a/mtr/csinternal/devregression/r/mcs7040_regression_bug3012.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7040_regression_bug3012.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7040_regression_bug3012.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7040_regression_bug3012.result diff --git a/mtr/csinternal/devregression/r/mcs7041_regression_bug3019.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7041_regression_bug3019.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7041_regression_bug3019.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7041_regression_bug3019.result diff --git a/mtr/csinternal/devregression/r/mcs7042_regression_bug3021.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7042_regression_bug3021.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7042_regression_bug3021.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7042_regression_bug3021.result diff --git a/mtr/csinternal/devregression/r/mcs7043_regression_bug3024.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7043_regression_bug3024.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7043_regression_bug3024.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7043_regression_bug3024.result diff --git a/mtr/csinternal/devregression/r/mcs7044_regression_bug3025.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7044_regression_bug3025.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7044_regression_bug3025.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7044_regression_bug3025.result diff --git a/mtr/csinternal/devregression/r/mcs7045_regression_bug3051.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7045_regression_bug3051.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7045_regression_bug3051.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7045_regression_bug3051.result diff --git a/mtr/csinternal/devregression/r/mcs7046_regression_bug3058.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7046_regression_bug3058.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7046_regression_bug3058.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7046_regression_bug3058.result diff --git a/mtr/csinternal/devregression/r/mcs7047_regression_bug3067.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7047_regression_bug3067.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7047_regression_bug3067.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7047_regression_bug3067.result diff --git a/mtr/csinternal/devregression/r/mcs7048_regression_bug3076.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7048_regression_bug3076.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7048_regression_bug3076.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7048_regression_bug3076.result diff --git a/mtr/csinternal/devregression/r/mcs7049_regression_bug3129.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7049_regression_bug3129.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7049_regression_bug3129.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7049_regression_bug3129.result diff --git a/mtr/csinternal/devregression/r/mcs7050_regression_bug3137.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7050_regression_bug3137.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7050_regression_bug3137.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7050_regression_bug3137.result diff --git a/mtr/csinternal/devregression/r/mcs7051_regression_bug3167.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7051_regression_bug3167.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7051_regression_bug3167.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7051_regression_bug3167.result diff --git a/mtr/csinternal/devregression/r/mcs7052_regression_bug3181.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7052_regression_bug3181.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7052_regression_bug3181.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7052_regression_bug3181.result diff --git a/mtr/csinternal/devregression/r/mcs7053_regression_bug3193.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7053_regression_bug3193.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7053_regression_bug3193.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7053_regression_bug3193.result diff --git a/mtr/csinternal/devregression/r/mcs7054_regression_bug3194.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7054_regression_bug3194.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7054_regression_bug3194.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7054_regression_bug3194.result diff --git a/mtr/csinternal/devregression/r/mcs7055_regression_bug3203.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7055_regression_bug3203.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7055_regression_bug3203.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7055_regression_bug3203.result diff --git a/mtr/csinternal/devregression/r/mcs7056_regression_bug3229.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7056_regression_bug3229.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7056_regression_bug3229.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7056_regression_bug3229.result diff --git a/mtr/csinternal/devregression/r/mcs7057_regression_bug3258.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7057_regression_bug3258.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7057_regression_bug3258.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7057_regression_bug3258.result diff --git a/mtr/csinternal/devregression/r/mcs7058_regression_bug3262.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7058_regression_bug3262.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7058_regression_bug3262.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7058_regression_bug3262.result diff --git a/mtr/csinternal/devregression/r/mcs7059_regression_bug3267.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7059_regression_bug3267.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7059_regression_bug3267.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7059_regression_bug3267.result diff --git a/mtr/csinternal/devregression/r/mcs7060_regression_bug3270.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7060_regression_bug3270.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7060_regression_bug3270.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7060_regression_bug3270.result diff --git a/mtr/csinternal/devregression/r/mcs7061_regression_bug3272.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7061_regression_bug3272.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7061_regression_bug3272.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7061_regression_bug3272.result diff --git a/mtr/csinternal/devregression/r/mcs7062_regression_bug3274.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7062_regression_bug3274.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7062_regression_bug3274.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7062_regression_bug3274.result diff --git a/mtr/csinternal/devregression/r/mcs7063_regression_bug3279.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7063_regression_bug3279.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7063_regression_bug3279.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7063_regression_bug3279.result diff --git a/mtr/csinternal/devregression/r/mcs7064_regression_bug3283.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7064_regression_bug3283.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7064_regression_bug3283.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7064_regression_bug3283.result diff --git a/mtr/csinternal/devregression/r/mcs7065_regression_bug3292.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7065_regression_bug3292.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7065_regression_bug3292.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7065_regression_bug3292.result diff --git a/mtr/csinternal/devregression/r/mcs7066_regression_bug3295.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7066_regression_bug3295.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7066_regression_bug3295.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7066_regression_bug3295.result diff --git a/mtr/csinternal/devregression/r/mcs7067_regression_bug3312.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7067_regression_bug3312.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7067_regression_bug3312.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7067_regression_bug3312.result diff --git a/mtr/csinternal/devregression/r/mcs7068_regression_bug3314.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7068_regression_bug3314.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7068_regression_bug3314.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7068_regression_bug3314.result diff --git a/mtr/csinternal/devregression/r/mcs7069_regression_bug3331.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7069_regression_bug3331.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7069_regression_bug3331.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7069_regression_bug3331.result diff --git a/mtr/csinternal/devregression/r/mcs7070_regression_bug3333.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7070_regression_bug3333.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7070_regression_bug3333.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7070_regression_bug3333.result diff --git a/mtr/csinternal/devregression/r/mcs7071_regression_bug3334_ceil.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7071_regression_bug3334_ceil.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7071_regression_bug3334_ceil.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7071_regression_bug3334_ceil.result diff --git a/mtr/csinternal/devregression/r/mcs7072_regression_bug3406.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7072_regression_bug3406.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7072_regression_bug3406.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7072_regression_bug3406.result diff --git a/mtr/csinternal/devregression/r/mcs7073_regression_bug3338.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7073_regression_bug3338.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7073_regression_bug3338.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7073_regression_bug3338.result diff --git a/mtr/csinternal/devregression/r/mcs7074_regression_bug3344.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7074_regression_bug3344.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7074_regression_bug3344.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7074_regression_bug3344.result diff --git a/mtr/csinternal/devregression/r/mcs7075_regression_bug3381.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7075_regression_bug3381.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7075_regression_bug3381.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7075_regression_bug3381.result diff --git a/mtr/csinternal/devregression/r/mcs7076_regression_bug3398.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7076_regression_bug3398.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7076_regression_bug3398.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7076_regression_bug3398.result diff --git a/mtr/csinternal/devregression/r/mcs7077_regression_bug3414.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7077_regression_bug3414.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7077_regression_bug3414.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7077_regression_bug3414.result diff --git a/mtr/csinternal/devregression/r/mcs7078_regression_bug3436.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7078_regression_bug3436.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7078_regression_bug3436.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7078_regression_bug3436.result diff --git a/mtr/csinternal/devregression/r/mcs7079_regression_bug3442.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7079_regression_bug3442.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7079_regression_bug3442.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7079_regression_bug3442.result diff --git a/mtr/csinternal/devregression/r/mcs7080_regression_bug3443.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7080_regression_bug3443.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7080_regression_bug3443.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7080_regression_bug3443.result diff --git a/mtr/csinternal/devregression/r/mcs7081_regression_bug3458.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7081_regression_bug3458.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7081_regression_bug3458.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7081_regression_bug3458.result diff --git a/mtr/csinternal/devregression/r/mcs7082_regression_bug3475.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7082_regression_bug3475.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7082_regression_bug3475.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7082_regression_bug3475.result diff --git a/mtr/csinternal/devregression/r/mcs7083_regression_bug3477.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7083_regression_bug3477.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7083_regression_bug3477.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7083_regression_bug3477.result diff --git a/mtr/csinternal/devregression/r/mcs7084_regression_bug3482.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7084_regression_bug3482.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7084_regression_bug3482.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7084_regression_bug3482.result diff --git a/mtr/csinternal/devregression/r/mcs7085_regression_bug3483.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7085_regression_bug3483.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7085_regression_bug3483.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7085_regression_bug3483.result diff --git a/mtr/csinternal/devregression/r/mcs7086_regression_bug3484.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7086_regression_bug3484.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7086_regression_bug3484.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7086_regression_bug3484.result diff --git a/mtr/csinternal/devregression/r/mcs7087_regression_bug3488.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7087_regression_bug3488.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7087_regression_bug3488.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7087_regression_bug3488.result diff --git a/mtr/csinternal/devregression/r/mcs7088_regression_bug3492.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7088_regression_bug3492.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7088_regression_bug3492.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7088_regression_bug3492.result diff --git a/mtr/csinternal/devregression/r/mcs7089_regression_bug3496.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7089_regression_bug3496.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7089_regression_bug3496.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7089_regression_bug3496.result diff --git a/mtr/csinternal/devregression/r/mcs7090_regression_bug3497.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7090_regression_bug3497.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7090_regression_bug3497.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7090_regression_bug3497.result diff --git a/mtr/csinternal/devregression/r/mcs7091_regression_bug3506.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7091_regression_bug3506.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7091_regression_bug3506.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7091_regression_bug3506.result diff --git a/mtr/csinternal/devregression/r/mcs7092_regression_bug3509.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7092_regression_bug3509.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7092_regression_bug3509.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7092_regression_bug3509.result diff --git a/mtr/csinternal/devregression/r/mcs7093_regression_bug3518_negative.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7093_regression_bug3518_negative.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7093_regression_bug3518_negative.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7093_regression_bug3518_negative.result diff --git a/mtr/csinternal/devregression/r/mcs7094_regression_bug3520.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7094_regression_bug3520.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7094_regression_bug3520.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7094_regression_bug3520.result diff --git a/mtr/csinternal/devregression/r/mcs7095_regression_bug3522.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7095_regression_bug3522.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7095_regression_bug3522.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7095_regression_bug3522.result diff --git a/mtr/csinternal/devregression/r/mcs7096_regression_bug3523.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7096_regression_bug3523.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7096_regression_bug3523.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7096_regression_bug3523.result diff --git a/mtr/csinternal/devregression/r/mcs7097_regression_bug3524.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7097_regression_bug3524.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7097_regression_bug3524.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7097_regression_bug3524.result diff --git a/mtr/csinternal/devregression/r/mcs7098_regression_bug3532.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7098_regression_bug3532.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7098_regression_bug3532.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7098_regression_bug3532.result diff --git a/mtr/csinternal/devregression/r/mcs7099_regression_bug3554.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7099_regression_bug3554.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7099_regression_bug3554.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7099_regression_bug3554.result diff --git a/mtr/csinternal/devregression/r/mcs7100_regression_bug3563.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7100_regression_bug3563.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7100_regression_bug3563.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7100_regression_bug3563.result diff --git a/mtr/csinternal/devregression/r/mcs7101_regression_bug3565.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7101_regression_bug3565.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7101_regression_bug3565.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7101_regression_bug3565.result diff --git a/mtr/csinternal/devregression/r/mcs7102_regression_bug3570.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7102_regression_bug3570.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7102_regression_bug3570.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7102_regression_bug3570.result diff --git a/mtr/csinternal/devregression/r/mcs7103_regression_bug3582.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7103_regression_bug3582.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7103_regression_bug3582.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7103_regression_bug3582.result diff --git a/mtr/csinternal/devregression/r/mcs7104_regression_bug3584.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7104_regression_bug3584.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7104_regression_bug3584.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7104_regression_bug3584.result diff --git a/mtr/csinternal/devregression/r/mcs7105_regression_bug3585.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7105_regression_bug3585.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7105_regression_bug3585.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7105_regression_bug3585.result diff --git a/mtr/csinternal/devregression/r/mcs7106_regression_bug3669.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7106_regression_bug3669.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7106_regression_bug3669.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7106_regression_bug3669.result diff --git a/mtr/csinternal/devregression/r/mcs7107_regression_bug3670_negative.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7107_regression_bug3670_negative.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7107_regression_bug3670_negative.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7107_regression_bug3670_negative.result diff --git a/mtr/csinternal/devregression/r/mcs7108_regression_bug3671.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7108_regression_bug3671.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7108_regression_bug3671.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7108_regression_bug3671.result diff --git a/mtr/csinternal/devregression/r/mcs7109_regression_bug3680.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7109_regression_bug3680.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7109_regression_bug3680.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7109_regression_bug3680.result diff --git a/mtr/csinternal/devregression/r/mcs7110_regression_bug3682.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7110_regression_bug3682.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7110_regression_bug3682.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7110_regression_bug3682.result diff --git a/mtr/csinternal/devregression/r/mcs7111_regression_bug3706.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7111_regression_bug3706.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7111_regression_bug3706.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7111_regression_bug3706.result diff --git a/mtr/csinternal/devregression/r/mcs7112_regression_bug3708.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7112_regression_bug3708.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7112_regression_bug3708.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7112_regression_bug3708.result diff --git a/mtr/csinternal/devregression/r/mcs7113_regression_bug3719.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7113_regression_bug3719.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7113_regression_bug3719.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7113_regression_bug3719.result diff --git a/mtr/csinternal/devregression/r/mcs7114_regression_bug3720.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7114_regression_bug3720.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7114_regression_bug3720.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7114_regression_bug3720.result diff --git a/mtr/csinternal/devregression/r/mcs7115_regression_bug3728.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7115_regression_bug3728.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7115_regression_bug3728.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7115_regression_bug3728.result diff --git a/mtr/csinternal/devregression/r/mcs7116_regression_bug3731.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7116_regression_bug3731.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7116_regression_bug3731.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7116_regression_bug3731.result diff --git a/mtr/csinternal/devregression/r/mcs7117_regression_bug3736.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7117_regression_bug3736.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7117_regression_bug3736.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7117_regression_bug3736.result diff --git a/mtr/csinternal/devregression/r/mcs7118_regression_bug3749.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7118_regression_bug3749.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7118_regression_bug3749.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7118_regression_bug3749.result diff --git a/mtr/csinternal/devregression/r/mcs7119_regression_bug3752.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7119_regression_bug3752.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7119_regression_bug3752.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7119_regression_bug3752.result diff --git a/mtr/csinternal/devregression/r/mcs7120_regression_bug3761.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7120_regression_bug3761.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7120_regression_bug3761.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7120_regression_bug3761.result diff --git a/mtr/csinternal/devregression/r/mcs7121_regression_bug3783.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7121_regression_bug3783.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7121_regression_bug3783.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7121_regression_bug3783.result diff --git a/mtr/csinternal/devregression/r/mcs7122_regression_bug3788.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7122_regression_bug3788.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7122_regression_bug3788.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7122_regression_bug3788.result diff --git a/mtr/csinternal/devregression/r/mcs7123_regression_bug3792_negative.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7123_regression_bug3792_negative.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7123_regression_bug3792_negative.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7123_regression_bug3792_negative.result diff --git a/mtr/csinternal/devregression/r/mcs7124_regression_bug3798.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7124_regression_bug3798.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7124_regression_bug3798.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7124_regression_bug3798.result diff --git a/mtr/csinternal/devregression/r/mcs7125_regression_bug3819.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7125_regression_bug3819.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7125_regression_bug3819.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7125_regression_bug3819.result diff --git a/mtr/csinternal/devregression/r/mcs7126_regression_bug3853.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7126_regression_bug3853.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7126_regression_bug3853.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7126_regression_bug3853.result diff --git a/mtr/csinternal/devregression/r/mcs7127_regression_bug3881.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7127_regression_bug3881.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7127_regression_bug3881.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7127_regression_bug3881.result diff --git a/mtr/csinternal/devregression/r/mcs7128_regression_bug3911.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7128_regression_bug3911.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7128_regression_bug3911.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7128_regression_bug3911.result diff --git a/mtr/csinternal/devregression/r/mcs7129_regression_bug3932.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7129_regression_bug3932.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7129_regression_bug3932.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7129_regression_bug3932.result diff --git a/mtr/csinternal/devregression/r/mcs7130_regression_bug3935.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7130_regression_bug3935.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7130_regression_bug3935.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7130_regression_bug3935.result diff --git a/mtr/csinternal/devregression/r/mcs7131_regression_bug3948.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7131_regression_bug3948.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7131_regression_bug3948.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7131_regression_bug3948.result diff --git a/mtr/csinternal/devregression/r/mcs7132_regression_bug3952.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7132_regression_bug3952.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7132_regression_bug3952.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7132_regression_bug3952.result diff --git a/mtr/csinternal/devregression/r/mcs7133_regression_bug3961.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7133_regression_bug3961.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7133_regression_bug3961.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7133_regression_bug3961.result diff --git a/mtr/csinternal/devregression/r/mcs7134_regression_bug3997.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7134_regression_bug3997.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7134_regression_bug3997.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7134_regression_bug3997.result diff --git a/mtr/csinternal/devregression/r/mcs7135_regression_bug3998.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7135_regression_bug3998.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7135_regression_bug3998.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7135_regression_bug3998.result diff --git a/mtr/csinternal/devregression/r/mcs7136_regression_bug4027.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7136_regression_bug4027.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7136_regression_bug4027.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7136_regression_bug4027.result diff --git a/mtr/csinternal/devregression/r/mcs7137_regression_bug4031.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7137_regression_bug4031.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7137_regression_bug4031.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7137_regression_bug4031.result diff --git a/mtr/csinternal/devregression/r/mcs7138_regression_bug4033.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7138_regression_bug4033.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7138_regression_bug4033.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7138_regression_bug4033.result diff --git a/mtr/csinternal/devregression/r/mcs7139_regression_bug4074.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7139_regression_bug4074.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7139_regression_bug4074.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7139_regression_bug4074.result diff --git a/mtr/csinternal/devregression/r/mcs7140_regression_bug4215.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7140_regression_bug4215.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7140_regression_bug4215.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7140_regression_bug4215.result diff --git a/mtr/csinternal/devregression/r/mcs7141_regression_bug4222.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7141_regression_bug4222.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7141_regression_bug4222.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7141_regression_bug4222.result diff --git a/mtr/csinternal/devregression/r/mcs7142_regression_bug4250.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7142_regression_bug4250.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7142_regression_bug4250.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7142_regression_bug4250.result diff --git a/mtr/csinternal/devregression/r/mcs7143_regression_bug4346.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7143_regression_bug4346.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7143_regression_bug4346.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7143_regression_bug4346.result diff --git a/mtr/csinternal/devregression/r/mcs7144_regression_bug4359.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7144_regression_bug4359.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7144_regression_bug4359.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7144_regression_bug4359.result diff --git a/mtr/csinternal/devregression/r/mcs7145_regression_bug4373.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7145_regression_bug4373.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7145_regression_bug4373.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7145_regression_bug4373.result diff --git a/mtr/csinternal/devregression/r/mcs7146_regression_bug4386.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7146_regression_bug4386.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7146_regression_bug4386.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7146_regression_bug4386.result diff --git a/mtr/csinternal/devregression/r/mcs7147_regression_bug4388.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7147_regression_bug4388.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7147_regression_bug4388.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7147_regression_bug4388.result diff --git a/mtr/csinternal/devregression/r/mcs7148_regression_bug4391.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7148_regression_bug4391.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7148_regression_bug4391.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7148_regression_bug4391.result diff --git a/mtr/csinternal/devregression/r/mcs7149_regression_bug4394.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7149_regression_bug4394.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7149_regression_bug4394.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7149_regression_bug4394.result diff --git a/mtr/csinternal/devregression/r/mcs7150_regression_bug4422.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7150_regression_bug4422.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7150_regression_bug4422.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7150_regression_bug4422.result diff --git a/mtr/csinternal/devregression/r/mcs7151_regression_bug4431.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7151_regression_bug4431.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7151_regression_bug4431.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7151_regression_bug4431.result diff --git a/mtr/csinternal/devregression/r/mcs7152_regression_bug4457.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7152_regression_bug4457.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7152_regression_bug4457.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7152_regression_bug4457.result diff --git a/mtr/csinternal/devregression/r/mcs7153_regression_bug4488.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7153_regression_bug4488.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7153_regression_bug4488.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7153_regression_bug4488.result diff --git a/mtr/csinternal/devregression/r/mcs7154_regression_bug4509.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7154_regression_bug4509.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7154_regression_bug4509.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7154_regression_bug4509.result diff --git a/mtr/csinternal/devregression/r/mcs7155_regression_bug4543.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7155_regression_bug4543.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7155_regression_bug4543.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7155_regression_bug4543.result diff --git a/mtr/csinternal/devregression/r/mcs7156_regression_bug4703.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7156_regression_bug4703.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7156_regression_bug4703.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7156_regression_bug4703.result diff --git a/mtr/csinternal/devregression/r/mcs7157_regression_bug4757.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7157_regression_bug4757.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7157_regression_bug4757.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7157_regression_bug4757.result diff --git a/mtr/csinternal/devregression/r/mcs7158_regression_bug4767.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7158_regression_bug4767.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7158_regression_bug4767.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7158_regression_bug4767.result diff --git a/mtr/csinternal/devregression/r/mcs7159_regression_bug4827.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7159_regression_bug4827.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7159_regression_bug4827.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7159_regression_bug4827.result diff --git a/mtr/csinternal/devregression/r/mcs7160_regression_bug4848.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7160_regression_bug4848.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7160_regression_bug4848.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7160_regression_bug4848.result diff --git a/mtr/csinternal/devregression/r/mcs7161_regression_bug4947.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7161_regression_bug4947.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7161_regression_bug4947.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7161_regression_bug4947.result diff --git a/mtr/csinternal/devregression/r/mcs7162_regression_bug5044.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7162_regression_bug5044.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7162_regression_bug5044.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7162_regression_bug5044.result diff --git a/mtr/csinternal/devregression/r/mcs7163_regression_bug5091.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7163_regression_bug5091.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7163_regression_bug5091.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7163_regression_bug5091.result diff --git a/mtr/csinternal/devregression/r/mcs7164_regression_bug5096.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7164_regression_bug5096.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7164_regression_bug5096.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7164_regression_bug5096.result diff --git a/mtr/csinternal/devregression/r/mcs7165_regression_bug5098.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7165_regression_bug5098.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7165_regression_bug5098.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7165_regression_bug5098.result diff --git a/mtr/csinternal/devregression/r/mcs7166_regression_bug5099.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7166_regression_bug5099.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7166_regression_bug5099.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7166_regression_bug5099.result diff --git a/mtr/csinternal/devregression/r/mcs7167_regression_bug5133.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7167_regression_bug5133.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7167_regression_bug5133.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7167_regression_bug5133.result diff --git a/mtr/csinternal/devregression/r/mcs7168_regression_bug5173.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7168_regression_bug5173.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7168_regression_bug5173.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7168_regression_bug5173.result diff --git a/mtr/csinternal/devregression/r/mcs7169_regression_bug5176.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7169_regression_bug5176.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7169_regression_bug5176.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7169_regression_bug5176.result diff --git a/mtr/csinternal/devregression/r/mcs7170_regression_bug5228.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7170_regression_bug5228.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7170_regression_bug5228.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7170_regression_bug5228.result diff --git a/mtr/csinternal/devregression/r/mcs7171_regression_bug5229.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7171_regression_bug5229.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7171_regression_bug5229.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7171_regression_bug5229.result diff --git a/mtr/csinternal/devregression/r/mcs7172_regression_bug5230.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7172_regression_bug5230.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7172_regression_bug5230.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7172_regression_bug5230.result diff --git a/mtr/csinternal/devregression/r/mcs7173_regression_bug5267.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7173_regression_bug5267.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7173_regression_bug5267.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7173_regression_bug5267.result diff --git a/mtr/csinternal/devregression/r/mcs7174_regression_bug5286.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7174_regression_bug5286.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7174_regression_bug5286.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7174_regression_bug5286.result diff --git a/mtr/csinternal/devregression/r/mcs7175_regression_bug5289.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7175_regression_bug5289.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7175_regression_bug5289.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7175_regression_bug5289.result diff --git a/mtr/csinternal/devregression/r/mcs7176_regression_bug5311.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7176_regression_bug5311.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7176_regression_bug5311.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7176_regression_bug5311.result diff --git a/mtr/csinternal/devregression/r/mcs7177_regression_bug5319.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7177_regression_bug5319.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7177_regression_bug5319.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7177_regression_bug5319.result diff --git a/mtr/csinternal/devregression/r/mcs7178_regression_bug5345.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7178_regression_bug5345.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7178_regression_bug5345.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7178_regression_bug5345.result diff --git a/mtr/csinternal/devregression/r/mcs7179_regression_bug5366.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7179_regression_bug5366.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7179_regression_bug5366.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7179_regression_bug5366.result diff --git a/mtr/csinternal/devregression/r/mcs7180_regression_bug5374.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7180_regression_bug5374.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7180_regression_bug5374.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7180_regression_bug5374.result diff --git a/mtr/csinternal/devregression/r/mcs7181_regression_bug5448.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7181_regression_bug5448.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7181_regression_bug5448.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7181_regression_bug5448.result diff --git a/mtr/csinternal/devregression/r/mcs7182_regression_bug5687.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7182_regression_bug5687.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7182_regression_bug5687.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7182_regression_bug5687.result diff --git a/mtr/csinternal/devregression/r/mcs7183_regression_bug5712.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7183_regression_bug5712.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7183_regression_bug5712.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7183_regression_bug5712.result diff --git a/mtr/csinternal/devregression/r/mcs7184_regression_bug5715.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7184_regression_bug5715.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7184_regression_bug5715.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7184_regression_bug5715.result diff --git a/mtr/csinternal/devregression/r/mcs7185_regression_bug5764b.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7185_regression_bug5764b.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7185_regression_bug5764b.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7185_regression_bug5764b.result diff --git a/mtr/csinternal/devregression/r/mcs7186_regression_bug5764.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7186_regression_bug5764.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7186_regression_bug5764.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7186_regression_bug5764.result diff --git a/mtr/csinternal/devregression/r/mcs7187_regression_bug5777.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7187_regression_bug5777.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7187_regression_bug5777.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7187_regression_bug5777.result diff --git a/mtr/csinternal/devregression/r/mcs7188_regression_bug5805.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7188_regression_bug5805.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7188_regression_bug5805.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7188_regression_bug5805.result diff --git a/mtr/csinternal/devregression/r/mcs7189_regression_bug5820.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7189_regression_bug5820.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7189_regression_bug5820.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7189_regression_bug5820.result diff --git a/mtr/csinternal/devregression/r/mcs7190_regression_bug5932.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7190_regression_bug5932.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7190_regression_bug5932.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7190_regression_bug5932.result diff --git a/mtr/csinternal/devregression/r/mcs7191_regression_bug5976.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7191_regression_bug5976.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7191_regression_bug5976.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7191_regression_bug5976.result diff --git a/mtr/csinternal/devregression/r/mcs7192_regression_bug6065.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7192_regression_bug6065.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7192_regression_bug6065.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7192_regression_bug6065.result diff --git a/mtr/csinternal/devregression/r/mcs7193_regression_bug6113.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7193_regression_bug6113.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7193_regression_bug6113.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7193_regression_bug6113.result diff --git a/mtr/csinternal/devregression/r/mcs7194_regression_bug6126.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7194_regression_bug6126.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7194_regression_bug6126.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7194_regression_bug6126.result diff --git a/mtr/csinternal/devregression/r/mcs7195_regression_bug6134.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7195_regression_bug6134.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7195_regression_bug6134.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7195_regression_bug6134.result diff --git a/mtr/csinternal/devregression/r/mcs7196_regression_bug752.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7196_regression_bug752.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7196_regression_bug752.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7196_regression_bug752.result diff --git a/mtr/csinternal/devregression/r/mcs7197_regression_MCOL-1234.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7197_regression_MCOL-1234.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7197_regression_MCOL-1234.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7197_regression_MCOL-1234.result diff --git a/mtr/csinternal/devregression/r/mcs7198_regression_MCOL-1246.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7198_regression_MCOL-1246.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7198_regression_MCOL-1246.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7198_regression_MCOL-1246.result diff --git a/mtr/csinternal/devregression/r/mcs7199_regression_MCOL-128.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7199_regression_MCOL-128.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7199_regression_MCOL-128.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7199_regression_MCOL-128.result diff --git a/mtr/csinternal/devregression/r/mcs7200_regression_MCOL-1403.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7200_regression_MCOL-1403.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7200_regression_MCOL-1403.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7200_regression_MCOL-1403.result diff --git a/mtr/csinternal/devregression/r/mcs7201_regression_MCOL-1531.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7201_regression_MCOL-1531.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7201_regression_MCOL-1531.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7201_regression_MCOL-1531.result diff --git a/mtr/csinternal/devregression/r/mcs7202_regression_MCOL-1535.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7202_regression_MCOL-1535.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7202_regression_MCOL-1535.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7202_regression_MCOL-1535.result diff --git a/mtr/csinternal/devregression/r/mcs7203_regression_MCOL-1559.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7203_regression_MCOL-1559.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7203_regression_MCOL-1559.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7203_regression_MCOL-1559.result diff --git a/mtr/csinternal/devregression/r/mcs7204_regression_MCOL-163.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7204_regression_MCOL-163.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7204_regression_MCOL-163.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7204_regression_MCOL-163.result diff --git a/mtr/csinternal/devregression/r/mcs7205_regression_MCOL-1662.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7205_regression_MCOL-1662.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7205_regression_MCOL-1662.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7205_regression_MCOL-1662.result diff --git a/mtr/csinternal/devregression/r/mcs7206_regression_MCOL-1676.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7206_regression_MCOL-1676.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7206_regression_MCOL-1676.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7206_regression_MCOL-1676.result diff --git a/mtr/csinternal/devregression/r/mcs7207_regression_MCOL-1829.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7207_regression_MCOL-1829.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7207_regression_MCOL-1829.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7207_regression_MCOL-1829.result diff --git a/mtr/csinternal/devregression/r/mcs7208_regression_MCOL-1989.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7208_regression_MCOL-1989.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7208_regression_MCOL-1989.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7208_regression_MCOL-1989.result diff --git a/mtr/csinternal/devregression/r/mcs7209_regression_MCOL-2050.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7209_regression_MCOL-2050.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7209_regression_MCOL-2050.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7209_regression_MCOL-2050.result diff --git a/mtr/csinternal/devregression/r/mcs7210_regression_MCOL-2091.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7210_regression_MCOL-2091.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7210_regression_MCOL-2091.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7210_regression_MCOL-2091.result diff --git a/mtr/csinternal/devregression/r/mcs7211_regression_MCOL-2096.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7211_regression_MCOL-2096.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7211_regression_MCOL-2096.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7211_regression_MCOL-2096.result diff --git a/mtr/csinternal/devregression/r/mcs7212_regression_MCOL-2139.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7212_regression_MCOL-2139.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7212_regression_MCOL-2139.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7212_regression_MCOL-2139.result diff --git a/mtr/csinternal/devregression/r/mcs7213_regression_MCOL-2225.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7213_regression_MCOL-2225.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7213_regression_MCOL-2225.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7213_regression_MCOL-2225.result diff --git a/mtr/csinternal/devregression/r/mcs7214_regression_MCOL-2267.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7214_regression_MCOL-2267.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7214_regression_MCOL-2267.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7214_regression_MCOL-2267.result diff --git a/mtr/csinternal/devregression/r/mcs7215_regression_MCOL-3267.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7215_regression_MCOL-3267.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7215_regression_MCOL-3267.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7215_regression_MCOL-3267.result diff --git a/mtr/csinternal/devregression/r/mcs7216_regression_MCOL-3304.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7216_regression_MCOL-3304.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7216_regression_MCOL-3304.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7216_regression_MCOL-3304.result diff --git a/mtr/csinternal/devregression/r/mcs7217_regression_MCOL-3317.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7217_regression_MCOL-3317.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7217_regression_MCOL-3317.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7217_regression_MCOL-3317.result diff --git a/mtr/csinternal/devregression/r/mcs7218_regression_MCOL-3343.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7218_regression_MCOL-3343.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7218_regression_MCOL-3343.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7218_regression_MCOL-3343.result diff --git a/mtr/csinternal/devregression/r/mcs7219_regression_MCOL-3395.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7219_regression_MCOL-3395.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7219_regression_MCOL-3395.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7219_regression_MCOL-3395.result diff --git a/mtr/csinternal/devregression/r/mcs7220_regression_MCOL-3423.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7220_regression_MCOL-3423.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7220_regression_MCOL-3423.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7220_regression_MCOL-3423.result diff --git a/mtr/csinternal/devregression/r/mcs7221_regression_MCOL-3434.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7221_regression_MCOL-3434.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7221_regression_MCOL-3434.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7221_regression_MCOL-3434.result diff --git a/mtr/csinternal/devregression/r/mcs7222_regression_MCOL-3448.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7222_regression_MCOL-3448.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7222_regression_MCOL-3448.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7222_regression_MCOL-3448.result diff --git a/mtr/csinternal/devregression/r/mcs7223_regression_MCOL-3485.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7223_regression_MCOL-3485.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7223_regression_MCOL-3485.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7223_regression_MCOL-3485.result diff --git a/mtr/csinternal/devregression/r/mcs7224_regression_MCOL-3503.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7224_regression_MCOL-3503.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7224_regression_MCOL-3503.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7224_regression_MCOL-3503.result diff --git a/mtr/csinternal/devregression/r/mcs7225_regression_MCOL-3721.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7225_regression_MCOL-3721.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7225_regression_MCOL-3721.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7225_regression_MCOL-3721.result diff --git a/mtr/csinternal/devregression/r/mcs7226_regression_MCOL_3747.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7226_regression_MCOL_3747.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7226_regression_MCOL_3747.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7226_regression_MCOL_3747.result diff --git a/mtr/csinternal/devregression/r/mcs7227_regression_MCOL-3766.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7227_regression_MCOL-3766.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7227_regression_MCOL-3766.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7227_regression_MCOL-3766.result diff --git a/mtr/csinternal/devregression/r/mcs7228_regression_MCOL-3813.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7228_regression_MCOL-3813.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7228_regression_MCOL-3813.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7228_regression_MCOL-3813.result diff --git a/mtr/csinternal/devregression/r/mcs7229_regression_MCOL-3839.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7229_regression_MCOL-3839.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7229_regression_MCOL-3839.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7229_regression_MCOL-3839.result diff --git a/mtr/csinternal/devregression/r/mcs7230_regression_MCOL-4000.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7230_regression_MCOL-4000.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7230_regression_MCOL-4000.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7230_regression_MCOL-4000.result diff --git a/mtr/csinternal/devregression/r/mcs7231_regression_MCOL-4002.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7231_regression_MCOL-4002.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7231_regression_MCOL-4002.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7231_regression_MCOL-4002.result diff --git a/mtr/csinternal/devregression/r/mcs7232_regression_MCOL-4126.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7232_regression_MCOL-4126.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7232_regression_MCOL-4126.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7232_regression_MCOL-4126.result diff --git a/mtr/csinternal/devregression/r/mcs7233_regression_MCOL-477.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7233_regression_MCOL-477.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7233_regression_MCOL-477.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7233_regression_MCOL-477.result diff --git a/mtr/csinternal/devregression/r/mcs7234_regression_MCOL-656.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7234_regression_MCOL-656.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7234_regression_MCOL-656.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7234_regression_MCOL-656.result diff --git a/mtr/csinternal/devregression/r/mcs7235_regression_MCOL-657.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7235_regression_MCOL-657.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7235_regression_MCOL-657.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7235_regression_MCOL-657.result diff --git a/mtr/csinternal/devregression/r/mcs7236_regression_MCOL-736.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7236_regression_MCOL-736.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7236_regression_MCOL-736.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7236_regression_MCOL-736.result diff --git a/mtr/csinternal/devregression/r/mcs7237_regression_MCOL-812.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7237_regression_MCOL-812.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7237_regression_MCOL-812.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7237_regression_MCOL-812.result diff --git a/mtr/csinternal/devregression/r/mcs7238_regression_MCOL-830.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7238_regression_MCOL-830.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7238_regression_MCOL-830.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7238_regression_MCOL-830.result diff --git a/mtr/csinternal/devregression/r/mcs7239_regression_MCOL-979.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7239_regression_MCOL-979.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7239_regression_MCOL-979.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7239_regression_MCOL-979.result diff --git a/mtr/csinternal/devregression/r/mcs7240_regression_bug1936-isNullisNotNull.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7240_regression_bug1936-isNullisNotNull.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7240_regression_bug1936-isNullisNotNull.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7240_regression_bug1936-isNullisNotNull.result diff --git a/mtr/csinternal/devregression/r/mcs7241_regression_bug1946-stringColToColComparisons.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7241_regression_bug1946-stringColToColComparisons.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7241_regression_bug1946-stringColToColComparisons.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7241_regression_bug1946-stringColToColComparisons.result diff --git a/mtr/csinternal/devregression/r/mcs7242_regression_bug2833.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7242_regression_bug2833.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7242_regression_bug2833.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7242_regression_bug2833.result diff --git a/mtr/csinternal/devregression/r/mcs7243_regression_bug2834.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7243_regression_bug2834.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7243_regression_bug2834.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7243_regression_bug2834.result diff --git a/mtr/csinternal/devregression/r/mcs7244_regression_bug2887_negative.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7244_regression_bug2887_negative.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7244_regression_bug2887_negative.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7244_regression_bug2887_negative.result diff --git a/mtr/csinternal/devregression/r/mcs7245_regression_bug2977.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7245_regression_bug2977.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7245_regression_bug2977.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7245_regression_bug2977.result diff --git a/mtr/csinternal/devregression/r/mcs7246_regression_bug3038.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7246_regression_bug3038.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7246_regression_bug3038.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7246_regression_bug3038.result diff --git a/mtr/csinternal/devregression/r/mcs7247_regression_bug3038b.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7247_regression_bug3038b.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7247_regression_bug3038b.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7247_regression_bug3038b.result diff --git a/mtr/csinternal/devregression/r/mcs7248_regression_bug3038c.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7248_regression_bug3038c.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7248_regression_bug3038c.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7248_regression_bug3038c.result diff --git a/mtr/csinternal/devregression/r/mcs7249_regression_bug3791.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7249_regression_bug3791.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7249_regression_bug3791.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7249_regression_bug3791.result diff --git a/mtr/csinternal/devregression/r/mcs7250_regression_bug4594.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7250_regression_bug4594.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7250_regression_bug4594.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7250_regression_bug4594.result diff --git a/mtr/csinternal/devregression/r/mcs7251_regression_bug5315.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7251_regression_bug5315.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7251_regression_bug5315.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7251_regression_bug5315.result diff --git a/mtr/csinternal/devregression/r/mcs7252_regression_MCOL-669.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7252_regression_MCOL-669.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7252_regression_MCOL-669.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7252_regression_MCOL-669.result diff --git a/mtr/csinternal/devregression/r/mcs7253_regression_MCOL-670.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7253_regression_MCOL-670.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7253_regression_MCOL-670.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7253_regression_MCOL-670.result diff --git a/mtr/csinternal/devregression/r/mcs7254_regression_MCOL-671.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7254_regression_MCOL-671.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7254_regression_MCOL-671.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7254_regression_MCOL-671.result diff --git a/mtr/csinternal/devregression/r/mcs7255_regression_MCOL-673.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7255_regression_MCOL-673.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7255_regression_MCOL-673.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7255_regression_MCOL-673.result diff --git a/mtr/csinternal/devregression/r/mcs7256_regression_mcol-1188.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7256_regression_mcol-1188.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7256_regression_mcol-1188.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7256_regression_mcol-1188.result diff --git a/mtr/csinternal/devregression/r/mcs7257_regression_mcol1642.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7257_regression_mcol1642.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7257_regression_mcol1642.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7257_regression_mcol1642.result diff --git a/mtr/csinternal/devregression/r/mcs7500_qa_fe_cnxFunctions_mathexpr_nl.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7500_qa_fe_cnxFunctions_mathexpr_nl.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7500_qa_fe_cnxFunctions_mathexpr_nl.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7500_qa_fe_cnxFunctions_mathexpr_nl.result diff --git a/mtr/csinternal/devregression/r/mcs7501_qa_fe_cnxExpressions_mathexpr1_nl.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7501_qa_fe_cnxExpressions_mathexpr1_nl.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7501_qa_fe_cnxExpressions_mathexpr1_nl.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7501_qa_fe_cnxExpressions_mathexpr1_nl.result diff --git a/mtr/csinternal/devregression/r/mcs7502_qa_fe_cnxExpressions_mathexpr2_nl.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7502_qa_fe_cnxExpressions_mathexpr2_nl.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7502_qa_fe_cnxExpressions_mathexpr2_nl.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7502_qa_fe_cnxExpressions_mathexpr2_nl.result diff --git a/mtr/csinternal/devregression/r/mcs7504_qa_fe_cnxExpressions_mathexpr4_nm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7504_qa_fe_cnxExpressions_mathexpr4_nm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7504_qa_fe_cnxExpressions_mathexpr4_nm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7504_qa_fe_cnxExpressions_mathexpr4_nm.result diff --git a/mtr/csinternal/devregression/r/mcs7506_qa_fe_cnxExpressions_mathexpr6_nm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7506_qa_fe_cnxExpressions_mathexpr6_nm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7506_qa_fe_cnxExpressions_mathexpr6_nm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7506_qa_fe_cnxExpressions_mathexpr6_nm.result diff --git a/mtr/csinternal/devregression/r/mcs7507_qa_fe_cnxExpressions_mathexpr7_nm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7507_qa_fe_cnxExpressions_mathexpr7_nm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7507_qa_fe_cnxExpressions_mathexpr7_nm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7507_qa_fe_cnxExpressions_mathexpr7_nm.result diff --git a/mtr/csinternal/devregression/r/mcs7509_qa_fe_cnxExpressions_mathexpr9_nm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7509_qa_fe_cnxExpressions_mathexpr9_nm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7509_qa_fe_cnxExpressions_mathexpr9_nm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7509_qa_fe_cnxExpressions_mathexpr9_nm.result diff --git a/mtr/csinternal/devregression/r/mcs7510_qa_fe_cnxExpressions_mathexpr10_nm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7510_qa_fe_cnxExpressions_mathexpr10_nm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7510_qa_fe_cnxExpressions_mathexpr10_nm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7510_qa_fe_cnxExpressions_mathexpr10_nm.result diff --git a/mtr/csinternal/devregression/r/mcs7511_functionsAndExpressions_mathexpr11_nm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7511_functionsAndExpressions_mathexpr11_nm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7511_functionsAndExpressions_mathexpr11_nm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7511_functionsAndExpressions_mathexpr11_nm.result diff --git a/mtr/csinternal/devregression/r/mcs7514_functionsAndExpressions_mathexpr14_nm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7514_functionsAndExpressions_mathexpr14_nm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7514_functionsAndExpressions_mathexpr14_nm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7514_functionsAndExpressions_mathexpr14_nm.result diff --git a/mtr/csinternal/devregression/r/mcs7517_functionsAndExpressions_mathexpr17_nm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7517_functionsAndExpressions_mathexpr17_nm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7517_functionsAndExpressions_mathexpr17_nm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7517_functionsAndExpressions_mathexpr17_nm.result diff --git a/mtr/csinternal/devregression/r/mcs7518_qa_fe_cnxExpressions_mathexpr18_nm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7518_qa_fe_cnxExpressions_mathexpr18_nm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7518_qa_fe_cnxExpressions_mathexpr18_nm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7518_qa_fe_cnxExpressions_mathexpr18_nm.result diff --git a/mtr/csinternal/devregression/r/mcs7519_qa_fe_postProcessedFunctions_mathexpr_nl.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7519_qa_fe_postProcessedFunctions_mathexpr_nl.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7519_qa_fe_postProcessedFunctions_mathexpr_nl.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7519_qa_fe_postProcessedFunctions_mathexpr_nl.result diff --git a/mtr/csinternal/devregression/r/mcs7521_storedProcedures_sp.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7521_storedProcedures_sp.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7521_storedProcedures_sp.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7521_storedProcedures_sp.result diff --git a/mtr/csinternal/devregression/r/mcs7522_storedProcedures_sp_autoswitch.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7522_storedProcedures_sp_autoswitch.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7522_storedProcedures_sp_autoswitch.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7522_storedProcedures_sp_autoswitch.result diff --git a/mtr/csinternal/devregression/r/mcs7523_partitionOptimization_aCreateViews.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7523_partitionOptimization_aCreateViews.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7523_partitionOptimization_aCreateViews.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7523_partitionOptimization_aCreateViews.result diff --git a/mtr/csinternal/devregression/r/mcs7524_view_sp.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7524_view_sp.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7524_view_sp.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7524_view_sp.result diff --git a/mtr/csinternal/devregression/r/mcs7525_MCOL-829.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7525_MCOL-829.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7525_MCOL-829.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7525_MCOL-829.result diff --git a/mtr/csinternal/devregression/r/mcs7526_q2_3_1_1_1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7526_q2_3_1_1_1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7526_q2_3_1_1_1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7526_q2_3_1_1_1.result diff --git a/mtr/csinternal/devregression/r/mcs7527_q2_3_1_1_2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7527_q2_3_1_1_2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7527_q2_3_1_1_2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7527_q2_3_1_1_2.result diff --git a/mtr/csinternal/devregression/r/mcs7528_q2_3_2_1_2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7528_q2_3_2_1_2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7528_q2_3_2_1_2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7528_q2_3_2_1_2.result diff --git a/mtr/csinternal/devregression/r/mcs7529_q2_3_2_1_3.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7529_q2_3_2_1_3.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7529_q2_3_2_1_3.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7529_q2_3_2_1_3.result diff --git a/mtr/csinternal/devregression/r/mcs7530_q2_3_2_1_4.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7530_q2_3_2_1_4.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7530_q2_3_2_1_4.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7530_q2_3_2_1_4.result diff --git a/mtr/csinternal/devregression/r/mcs7531_q2_3_4_1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7531_q2_3_4_1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7531_q2_3_4_1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7531_q2_3_4_1.result diff --git a/mtr/csinternal/devregression/r/mcs7532_q2_3_4_2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7532_q2_3_4_2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7532_q2_3_4_2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7532_q2_3_4_2.result diff --git a/mtr/csinternal/devregression/r/mcs7533_q2_3_4_3.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7533_q2_3_4_3.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7533_q2_3_4_3.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7533_q2_3_4_3.result diff --git a/mtr/csinternal/devregression/r/mcs7534_q2_3_4_4.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7534_q2_3_4_4.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7534_q2_3_4_4.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7534_q2_3_4_4.result diff --git a/mtr/csinternal/devregression/r/mcs7535_q2_3_6.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7535_q2_3_6.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7535_q2_3_6.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7535_q2_3_6.result diff --git a/mtr/csinternal/devregression/r/mcs7536_q4_2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7536_q4_2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7536_q4_2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7536_q4_2.result diff --git a/mtr/csinternal/devregression/r/mcs7537_q4_4.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7537_q4_4.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7537_q4_4.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7537_q4_4.result diff --git a/mtr/csinternal/devregression/r/mcs7538_q4_6_1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7538_q4_6_1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7538_q4_6_1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7538_q4_6_1.result diff --git a/mtr/csinternal/devregression/r/mcs7539_q4_6_2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7539_q4_6_2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7539_q4_6_2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7539_q4_6_2.result diff --git a/mtr/csinternal/devregression/r/mcs7540_q4_6.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7540_q4_6.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7540_q4_6.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7540_q4_6.result diff --git a/mtr/csinternal/devregression/r/mcs7541_q4_8_1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7541_q4_8_1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7541_q4_8_1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7541_q4_8_1.result diff --git a/mtr/csinternal/devregression/r/mcs7542_q4_8_2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7542_q4_8_2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7542_q4_8_2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7542_q4_8_2.result diff --git a/mtr/csinternal/devregression/r/mcs7543_q4_8_3.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7543_q4_8_3.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7543_q4_8_3.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7543_q4_8_3.result diff --git a/mtr/csinternal/devregression/r/mcs7544_q4_8_4.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7544_q4_8_4.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7544_q4_8_4.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7544_q4_8_4.result diff --git a/mtr/csinternal/devregression/r/mcs7545_q4_8_5.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7545_q4_8_5.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7545_q4_8_5.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7545_q4_8_5.result diff --git a/mtr/csinternal/devregression/r/mcs7546_q4_8_6.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7546_q4_8_6.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7546_q4_8_6.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7546_q4_8_6.result diff --git a/mtr/csinternal/devregression/r/mcs7547_q4_8_7.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7547_q4_8_7.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7547_q4_8_7.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7547_q4_8_7.result diff --git a/mtr/csinternal/devregression/r/mcs7548_q4_8_8.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7548_q4_8_8.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7548_q4_8_8.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7548_q4_8_8.result diff --git a/mtr/csinternal/devregression/r/mcs7549_q4_8_9.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7549_q4_8_9.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7549_q4_8_9.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7549_q4_8_9.result diff --git a/mtr/csinternal/devregression/r/mcs7550_q5_1_1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7550_q5_1_1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7550_q5_1_1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7550_q5_1_1.result diff --git a/mtr/csinternal/devregression/r/mcs7551_q5_1_2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7551_q5_1_2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7551_q5_1_2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7551_q5_1_2.result diff --git a/mtr/csinternal/devregression/r/mcs7552_q5_1_3.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7552_q5_1_3.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7552_q5_1_3.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7552_q5_1_3.result diff --git a/mtr/csinternal/devregression/r/mcs7553_q5_2_1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7553_q5_2_1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7553_q5_2_1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7553_q5_2_1.result diff --git a/mtr/csinternal/devregression/r/mcs7554_q5_2_2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7554_q5_2_2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7554_q5_2_2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7554_q5_2_2.result diff --git a/mtr/csinternal/devregression/r/mcs7555_q5_2_3.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7555_q5_2_3.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7555_q5_2_3.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7555_q5_2_3.result diff --git a/mtr/csinternal/devregression/r/mcs7556_q5_2_4.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7556_q5_2_4.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7556_q5_2_4.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7556_q5_2_4.result diff --git a/mtr/csinternal/devregression/r/mcs7557_q5_2_5.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7557_q5_2_5.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7557_q5_2_5.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7557_q5_2_5.result diff --git a/mtr/csinternal/devregression/r/mcs7558_q5_3_1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7558_q5_3_1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7558_q5_3_1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7558_q5_3_1.result diff --git a/mtr/csinternal/devregression/r/mcs7559_q5_4_1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7559_q5_4_1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7559_q5_4_1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7559_q5_4_1.result diff --git a/mtr/csinternal/devregression/r/mcs7560_q5_4_2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7560_q5_4_2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7560_q5_4_2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7560_q5_4_2.result diff --git a/mtr/csinternal/devregression/r/mcs7561_q5_4_3.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7561_q5_4_3.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7561_q5_4_3.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7561_q5_4_3.result diff --git a/mtr/csinternal/devregression/r/mcs7562_aggregate_tpch_lineitem.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7562_aggregate_tpch_lineitem.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7562_aggregate_tpch_lineitem.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7562_aggregate_tpch_lineitem.result diff --git a/mtr/csinternal/devregression/r/mcs7563_aggregate_tpch_orders.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7563_aggregate_tpch_orders.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7563_aggregate_tpch_orders.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7563_aggregate_tpch_orders.result diff --git a/mtr/csinternal/devregression/r/mcs7564_aggregate_tpch_others.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7564_aggregate_tpch_others.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7564_aggregate_tpch_others.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7564_aggregate_tpch_others.result diff --git a/mtr/csinternal/devregression/r/mcs7565_dataval_001.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7565_dataval_001.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7565_dataval_001.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7565_dataval_001.result diff --git a/mtr/csinternal/devregression/r/mcs7566_dataval_002.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7566_dataval_002.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7566_dataval_002.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7566_dataval_002.result diff --git a/mtr/csinternal/devregression/r/mcs7567_dataval_003.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7567_dataval_003.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7567_dataval_003.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7567_dataval_003.result diff --git a/mtr/csinternal/devregression/r/mcs7568_dataval_004.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7568_dataval_004.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7568_dataval_004.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7568_dataval_004.result diff --git a/mtr/csinternal/devregression/r/mcs7569_dataval_005.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7569_dataval_005.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7569_dataval_005.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7569_dataval_005.result diff --git a/mtr/csinternal/devregression/r/mcs7570_str_aggregate_tpch_lineitem.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7570_str_aggregate_tpch_lineitem.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7570_str_aggregate_tpch_lineitem.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7570_str_aggregate_tpch_lineitem.result diff --git a/mtr/csinternal/devregression/r/mcs7571_tpchValidation.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7571_tpchValidation.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7571_tpchValidation.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7571_tpchValidation.result diff --git a/mtr/csinternal/devregression/r/mcs7572_ssbValidation.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7572_ssbValidation.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7572_ssbValidation.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7572_ssbValidation.result diff --git a/mtr/csinternal/devregression/r/mcs7573_datatypetestm.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7573_datatypetestm.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7573_datatypetestm.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7573_datatypetestm.result diff --git a/mtr/csinternal/devregression/r/mcs7574_datatypetestm1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7574_datatypetestm1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7574_datatypetestm1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7574_datatypetestm1.result diff --git a/mtr/csinternal/devregression/r/mcs7575_datatypetestm2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7575_datatypetestm2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7575_datatypetestm2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7575_datatypetestm2.result diff --git a/mtr/csinternal/devregression/r/mcs7577_dtypes.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7577_dtypes.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7577_dtypes.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7577_dtypes.result diff --git a/mtr/csinternal/devregression/r/mcs7578_j1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7578_j1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7578_j1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7578_j1.result diff --git a/mtr/csinternal/devregression/r/mcs7579_j11.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7579_j11.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7579_j11.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7579_j11.result diff --git a/mtr/csinternal/devregression/r/mcs7580_j16.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7580_j16.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7580_j16.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7580_j16.result diff --git a/mtr/csinternal/devregression/r/mcs7581_j6.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7581_j6.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7581_j6.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7581_j6.result diff --git a/mtr/csinternal/devregression/r/mcs7582_sub1.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7582_sub1.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7582_sub1.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7582_sub1.result diff --git a/mtr/csinternal/devregression/r/mcs7583_sub2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7583_sub2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7583_sub2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7583_sub2.result diff --git a/mtr/csinternal/devregression/r/mcs7584_sub3.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7584_sub3.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7584_sub3.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7584_sub3.result diff --git a/mtr/csinternal/devregression/r/mcs7585_sub4.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7585_sub4.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7585_sub4.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7585_sub4.result diff --git a/mtr/csinternal/devregression/r/mcs7586_sub5.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7586_sub5.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7586_sub5.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7586_sub5.result diff --git a/mtr/csinternal/devregression/r/mcs7591_tpchValidation.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7591_tpchValidation.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7591_tpchValidation.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7591_tpchValidation.result diff --git a/mtr/csinternal/devregression/r/mcs7592_wide.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7592_wide.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7592_wide.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7592_wide.result diff --git a/mtr/csinternal/devregression/r/mcs7593_q23111.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7593_q23111.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7593_q23111.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7593_q23111.result diff --git a/mtr/csinternal/devregression/r/mcs7594_q23112.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7594_q23112.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7594_q23112.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7594_q23112.result diff --git a/mtr/csinternal/devregression/r/mcs7595_q23211.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7595_q23211.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7595_q23211.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7595_q23211.result diff --git a/mtr/csinternal/devregression/r/mcs7596_q23212.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7596_q23212.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7596_q23212.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7596_q23212.result diff --git a/mtr/csinternal/devregression/r/mcs7597_q23213.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7597_q23213.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7597_q23213.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7597_q23213.result diff --git a/mtr/csinternal/devregression/r/mcs7598_q23214.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7598_q23214.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7598_q23214.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7598_q23214.result diff --git a/mtr/csinternal/devregression/r/mcs7599_q2341.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7599_q2341.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7599_q2341.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7599_q2341.result diff --git a/mtr/csinternal/devregression/r/mcs7600_q2342.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7600_q2342.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7600_q2342.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7600_q2342.result diff --git a/mtr/csinternal/devregression/r/mcs7601_q2343.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7601_q2343.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7601_q2343.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7601_q2343.result diff --git a/mtr/csinternal/devregression/r/mcs7602_q2344.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7602_q2344.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7602_q2344.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7602_q2344.result diff --git a/mtr/csinternal/devregression/r/mcs7603_q236.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7603_q236.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7603_q236.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7603_q236.result diff --git a/mtr/csinternal/devregression/r/mcs7604_q42.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7604_q42.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7604_q42.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7604_q42.result diff --git a/mtr/csinternal/devregression/r/mcs7605_q43.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7605_q43.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7605_q43.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7605_q43.result diff --git a/mtr/csinternal/devregression/r/mcs7606_q44.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7606_q44.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7606_q44.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7606_q44.result diff --git a/mtr/csinternal/devregression/r/mcs7607_q461.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7607_q461.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7607_q461.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7607_q461.result diff --git a/mtr/csinternal/devregression/r/mcs7608_q462.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7608_q462.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7608_q462.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7608_q462.result diff --git a/mtr/csinternal/devregression/r/mcs7609_q46.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7609_q46.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7609_q46.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7609_q46.result diff --git a/mtr/csinternal/devregression/r/mcs7610_q481.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7610_q481.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7610_q481.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7610_q481.result diff --git a/mtr/csinternal/devregression/r/mcs7611_q482.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7611_q482.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7611_q482.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7611_q482.result diff --git a/mtr/csinternal/devregression/r/mcs7612_q483.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7612_q483.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7612_q483.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7612_q483.result diff --git a/mtr/csinternal/devregression/r/mcs7613_q484.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7613_q484.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7613_q484.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7613_q484.result diff --git a/mtr/csinternal/devregression/r/mcs7614_q485.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7614_q485.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7614_q485.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7614_q485.result diff --git a/mtr/csinternal/devregression/r/mcs7615_q486.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7615_q486.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7615_q486.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7615_q486.result diff --git a/mtr/csinternal/devregression/r/mcs7616_q487.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7616_q487.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7616_q487.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7616_q487.result diff --git a/mtr/csinternal/devregression/r/mcs7617_q488.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7617_q488.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7617_q488.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7617_q488.result diff --git a/mtr/csinternal/devregression/r/mcs7618_q489.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7618_q489.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7618_q489.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7618_q489.result diff --git a/mtr/csinternal/devregression/r/mcs7619_q511.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7619_q511.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7619_q511.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7619_q511.result diff --git a/mtr/csinternal/devregression/r/mcs7620_q512.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7620_q512.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7620_q512.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7620_q512.result diff --git a/mtr/csinternal/devregression/r/mcs7621_q513.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7621_q513.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7621_q513.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7621_q513.result diff --git a/mtr/csinternal/devregression/r/mcs7622_q521.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7622_q521.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7622_q521.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7622_q521.result diff --git a/mtr/csinternal/devregression/r/mcs7623_q522.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7623_q522.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7623_q522.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7623_q522.result diff --git a/mtr/csinternal/devregression/r/mcs7624_q523.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7624_q523.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7624_q523.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7624_q523.result diff --git a/mtr/csinternal/devregression/r/mcs7625_q524.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7625_q524.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7625_q524.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7625_q524.result diff --git a/mtr/csinternal/devregression/r/mcs7626_q525.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7626_q525.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7626_q525.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7626_q525.result diff --git a/mtr/csinternal/devregression/r/mcs7627_q531.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7627_q531.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7627_q531.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7627_q531.result diff --git a/mtr/csinternal/devregression/r/mcs7628_q541.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7628_q541.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7628_q541.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7628_q541.result diff --git a/mtr/csinternal/devregression/r/mcs7629_q542.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7629_q542.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7629_q542.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7629_q542.result diff --git a/mtr/csinternal/devregression/r/mcs7630_q543.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7630_q543.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7630_q543.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7630_q543.result diff --git a/mtr/csinternal/devregression/r/mcs7631_q111.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7631_q111.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7631_q111.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7631_q111.result diff --git a/mtr/csinternal/devregression/r/mcs7632_q112.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7632_q112.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7632_q112.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7632_q112.result diff --git a/mtr/csinternal/devregression/r/mcs7633_q113.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7633_q113.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7633_q113.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7633_q113.result diff --git a/mtr/csinternal/devregression/r/mcs7634_q211.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7634_q211.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7634_q211.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7634_q211.result diff --git a/mtr/csinternal/devregression/r/mcs7635_q212.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7635_q212.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7635_q212.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7635_q212.result diff --git a/mtr/csinternal/devregression/r/mcs7636_q213.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7636_q213.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7636_q213.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7636_q213.result diff --git a/mtr/csinternal/devregression/r/mcs7637_q214.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7637_q214.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7637_q214.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7637_q214.result diff --git a/mtr/csinternal/devregression/r/mcs7640_q23111.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7640_q23111.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7640_q23111.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7640_q23111.result diff --git a/mtr/csinternal/devregression/r/mcs7641_q23112.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7641_q23112.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7641_q23112.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7641_q23112.result diff --git a/mtr/csinternal/devregression/r/mcs7642_q23211.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7642_q23211.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7642_q23211.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7642_q23211.result diff --git a/mtr/csinternal/devregression/r/mcs7643_q23212.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7643_q23212.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7643_q23212.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7643_q23212.result diff --git a/mtr/csinternal/devregression/r/mcs7644_q23213.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7644_q23213.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7644_q23213.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7644_q23213.result diff --git a/mtr/csinternal/devregression/r/mcs7645_q23214.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7645_q23214.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7645_q23214.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7645_q23214.result diff --git a/mtr/csinternal/devregression/r/mcs7646_q2341.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7646_q2341.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7646_q2341.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7646_q2341.result diff --git a/mtr/csinternal/devregression/r/mcs7647_q2342.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7647_q2342.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7647_q2342.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7647_q2342.result diff --git a/mtr/csinternal/devregression/r/mcs7648_q2343.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7648_q2343.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7648_q2343.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7648_q2343.result diff --git a/mtr/csinternal/devregression/r/mcs7649_q2344.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7649_q2344.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7649_q2344.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7649_q2344.result diff --git a/mtr/csinternal/devregression/r/mcs7650_q236.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7650_q236.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7650_q236.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7650_q236.result diff --git a/mtr/csinternal/devregression/r/mcs7651_q42.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7651_q42.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7651_q42.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7651_q42.result diff --git a/mtr/csinternal/devregression/r/mcs7652_q43.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7652_q43.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7652_q43.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7652_q43.result diff --git a/mtr/csinternal/devregression/r/mcs7653_q44.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7653_q44.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7653_q44.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7653_q44.result diff --git a/mtr/csinternal/devregression/r/mcs7654_q461.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7654_q461.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7654_q461.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7654_q461.result diff --git a/mtr/csinternal/devregression/r/mcs7655_q462.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7655_q462.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7655_q462.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7655_q462.result diff --git a/mtr/csinternal/devregression/r/mcs7656_q46.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7656_q46.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7656_q46.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7656_q46.result diff --git a/mtr/csinternal/devregression/r/mcs7657_q481.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7657_q481.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7657_q481.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7657_q481.result diff --git a/mtr/csinternal/devregression/r/mcs7658_q482.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7658_q482.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7658_q482.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7658_q482.result diff --git a/mtr/csinternal/devregression/r/mcs7659_q483.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7659_q483.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7659_q483.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7659_q483.result diff --git a/mtr/csinternal/devregression/r/mcs7660_q484.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7660_q484.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7660_q484.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7660_q484.result diff --git a/mtr/csinternal/devregression/r/mcs7661_q485.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7661_q485.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7661_q485.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7661_q485.result diff --git a/mtr/csinternal/devregression/r/mcs7662_q486.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7662_q486.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7662_q486.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7662_q486.result diff --git a/mtr/csinternal/devregression/r/mcs7663_q487.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7663_q487.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7663_q487.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7663_q487.result diff --git a/mtr/csinternal/devregression/r/mcs7664_q488.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7664_q488.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7664_q488.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7664_q488.result diff --git a/mtr/csinternal/devregression/r/mcs7665_q489.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7665_q489.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7665_q489.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7665_q489.result diff --git a/mtr/csinternal/devregression/r/mcs7666_q511.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7666_q511.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7666_q511.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7666_q511.result diff --git a/mtr/csinternal/devregression/r/mcs7667_q512.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7667_q512.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7667_q512.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7667_q512.result diff --git a/mtr/csinternal/devregression/r/mcs7668_q513.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7668_q513.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7668_q513.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7668_q513.result diff --git a/mtr/csinternal/devregression/r/mcs7669_q521.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7669_q521.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7669_q521.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7669_q521.result diff --git a/mtr/csinternal/devregression/r/mcs7670_q522.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7670_q522.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7670_q522.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7670_q522.result diff --git a/mtr/csinternal/devregression/r/mcs7671_q523.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7671_q523.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7671_q523.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7671_q523.result diff --git a/mtr/csinternal/devregression/r/mcs7672_q524.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7672_q524.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7672_q524.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7672_q524.result diff --git a/mtr/csinternal/devregression/r/mcs7673_q525.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7673_q525.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7673_q525.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7673_q525.result diff --git a/mtr/csinternal/devregression/r/mcs7674_q531.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7674_q531.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7674_q531.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7674_q531.result diff --git a/mtr/csinternal/devregression/r/mcs7675_q541.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7675_q541.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7675_q541.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7675_q541.result diff --git a/mtr/csinternal/devregression/r/mcs7676_q542.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7676_q542.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7676_q542.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7676_q542.result diff --git a/mtr/csinternal/devregression/r/mcs7677_q543.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7677_q543.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7677_q543.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7677_q543.result diff --git a/mtr/csinternal/devregression/r/mcs7678_ssb_dim01.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7678_ssb_dim01.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7678_ssb_dim01.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7678_ssb_dim01.result diff --git a/mtr/csinternal/devregression/r/mcs7679_ssb_dim02.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7679_ssb_dim02.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7679_ssb_dim02.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7679_ssb_dim02.result diff --git a/mtr/csinternal/devregression/r/mcs7680_ssb_dim03.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7680_ssb_dim03.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7680_ssb_dim03.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7680_ssb_dim03.result diff --git a/mtr/csinternal/devregression/r/mcs7681_ssb_dim04.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7681_ssb_dim04.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7681_ssb_dim04.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7681_ssb_dim04.result diff --git a/mtr/csinternal/devregression/r/mcs7682_ssb_dim05.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7682_ssb_dim05.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7682_ssb_dim05.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7682_ssb_dim05.result diff --git a/mtr/csinternal/devregression/r/mcs7683_ssb_dim06.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7683_ssb_dim06.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7683_ssb_dim06.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7683_ssb_dim06.result diff --git a/mtr/csinternal/devregression/r/mcs7684_ssb_dim07.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7684_ssb_dim07.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7684_ssb_dim07.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7684_ssb_dim07.result diff --git a/mtr/csinternal/devregression/r/mcs7685_ssb_dim08.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7685_ssb_dim08.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7685_ssb_dim08.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7685_ssb_dim08.result diff --git a/mtr/csinternal/devregression/r/mcs7686_ssb_dim09.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7686_ssb_dim09.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7686_ssb_dim09.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7686_ssb_dim09.result diff --git a/mtr/csinternal/devregression/r/mcs7687_ssb_dim10.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7687_ssb_dim10.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7687_ssb_dim10.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7687_ssb_dim10.result diff --git a/mtr/csinternal/devregression/r/mcs7688_ssb_dim11.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7688_ssb_dim11.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7688_ssb_dim11.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7688_ssb_dim11.result diff --git a/mtr/csinternal/devregression/r/mcs7689_ssb_dim12.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7689_ssb_dim12.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7689_ssb_dim12.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7689_ssb_dim12.result diff --git a/mtr/csinternal/devregression/r/mcs7690_ssb_dim_2colgrp02.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7690_ssb_dim_2colgrp02.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7690_ssb_dim_2colgrp02.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7690_ssb_dim_2colgrp02.result diff --git a/mtr/csinternal/devregression/r/mcs7691_ssb_dim_2colgrp03.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7691_ssb_dim_2colgrp03.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7691_ssb_dim_2colgrp03.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7691_ssb_dim_2colgrp03.result diff --git a/mtr/csinternal/devregression/r/mcs7692_ssb_dim_2colgrp04.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7692_ssb_dim_2colgrp04.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7692_ssb_dim_2colgrp04.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7692_ssb_dim_2colgrp04.result diff --git a/mtr/csinternal/devregression/r/mcs7693_ssb_dim_2colgrp05.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7693_ssb_dim_2colgrp05.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7693_ssb_dim_2colgrp05.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7693_ssb_dim_2colgrp05.result diff --git a/mtr/csinternal/devregression/r/mcs7694_ssb_dim_2colgrp06.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7694_ssb_dim_2colgrp06.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7694_ssb_dim_2colgrp06.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7694_ssb_dim_2colgrp06.result diff --git a/mtr/csinternal/devregression/r/mcs7695_ssb_dim_2colgrp07.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7695_ssb_dim_2colgrp07.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7695_ssb_dim_2colgrp07.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7695_ssb_dim_2colgrp07.result diff --git a/mtr/csinternal/devregression/r/mcs7696_ssb_dim_2colgrp08.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7696_ssb_dim_2colgrp08.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7696_ssb_dim_2colgrp08.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7696_ssb_dim_2colgrp08.result diff --git a/mtr/csinternal/devregression/r/mcs7697_ssb_dim_2colgrp09.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7697_ssb_dim_2colgrp09.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7697_ssb_dim_2colgrp09.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7697_ssb_dim_2colgrp09.result diff --git a/mtr/csinternal/devregression/r/mcs7698_ssb_dim_2colgrp10.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7698_ssb_dim_2colgrp10.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7698_ssb_dim_2colgrp10.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7698_ssb_dim_2colgrp10.result diff --git a/mtr/csinternal/devregression/r/mcs7699_ssb_dim_2colgrp11.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7699_ssb_dim_2colgrp11.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7699_ssb_dim_2colgrp11.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7699_ssb_dim_2colgrp11.result diff --git a/mtr/csinternal/devregression/r/mcs7700_ssb_dim_2colgrp12.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7700_ssb_dim_2colgrp12.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7700_ssb_dim_2colgrp12.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7700_ssb_dim_2colgrp12.result diff --git a/mtr/csinternal/devregression/r/mcs7701_q11mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7701_q11mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7701_q11mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7701_q11mod.result diff --git a/mtr/csinternal/devregression/r/mcs7702_q12mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7702_q12mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7702_q12mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7702_q12mod.result diff --git a/mtr/csinternal/devregression/r/mcs7703_q13mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7703_q13mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7703_q13mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7703_q13mod.result diff --git a/mtr/csinternal/devregression/r/mcs7704_q21mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7704_q21mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7704_q21mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7704_q21mod.result diff --git a/mtr/csinternal/devregression/r/mcs7705_q22mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7705_q22mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7705_q22mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7705_q22mod.result diff --git a/mtr/csinternal/devregression/r/mcs7706_q23mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7706_q23mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7706_q23mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7706_q23mod.result diff --git a/mtr/csinternal/devregression/r/mcs7707_q31mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7707_q31mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7707_q31mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7707_q31mod.result diff --git a/mtr/csinternal/devregression/r/mcs7708_q32mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7708_q32mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7708_q32mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7708_q32mod.result diff --git a/mtr/csinternal/devregression/r/mcs7709_q33mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7709_q33mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7709_q33mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7709_q33mod.result diff --git a/mtr/csinternal/devregression/r/mcs7710_q34mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7710_q34mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7710_q34mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7710_q34mod.result diff --git a/mtr/csinternal/devregression/r/mcs7711_q41mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7711_q41mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7711_q41mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7711_q41mod.result diff --git a/mtr/csinternal/devregression/r/mcs7712_q42mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7712_q42mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7712_q42mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7712_q42mod.result diff --git a/mtr/csinternal/devregression/r/mcs7713_q43mod.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7713_q43mod.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7713_q43mod.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7713_q43mod.result diff --git a/mtr/csinternal/devregression/r/mcs7714_ssb_dim_mixed_outer_2colgrp9.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7714_ssb_dim_mixed_outer_2colgrp9.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7714_ssb_dim_mixed_outer_2colgrp9.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7714_ssb_dim_mixed_outer_2colgrp9.result diff --git a/mtr/csinternal/devregression/r/mcs7715_ssb_dim_mixed_outer_2colgrp8.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7715_ssb_dim_mixed_outer_2colgrp8.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7715_ssb_dim_mixed_outer_2colgrp8.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7715_ssb_dim_mixed_outer_2colgrp8.result diff --git a/mtr/csinternal/devregression/r/mcs7716_ssb_dim_mixed_outer_2colgrp7.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7716_ssb_dim_mixed_outer_2colgrp7.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7716_ssb_dim_mixed_outer_2colgrp7.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7716_ssb_dim_mixed_outer_2colgrp7.result diff --git a/mtr/csinternal/devregression/r/mcs7717_ssb_dim_mixed_outer_2colgrp6.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7717_ssb_dim_mixed_outer_2colgrp6.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7717_ssb_dim_mixed_outer_2colgrp6.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7717_ssb_dim_mixed_outer_2colgrp6.result diff --git a/mtr/csinternal/devregression/r/mcs7718_ssb_dim_mixed_outer_2colgrp5.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7718_ssb_dim_mixed_outer_2colgrp5.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7718_ssb_dim_mixed_outer_2colgrp5.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7718_ssb_dim_mixed_outer_2colgrp5.result diff --git a/mtr/csinternal/devregression/r/mcs7719_ssb_dim_mixed_outer_2colgrp4.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7719_ssb_dim_mixed_outer_2colgrp4.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7719_ssb_dim_mixed_outer_2colgrp4.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7719_ssb_dim_mixed_outer_2colgrp4.result diff --git a/mtr/csinternal/devregression/r/mcs7720_ssb_dim_mixed_outer_2colgrp3.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7720_ssb_dim_mixed_outer_2colgrp3.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7720_ssb_dim_mixed_outer_2colgrp3.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7720_ssb_dim_mixed_outer_2colgrp3.result diff --git a/mtr/csinternal/devregression/r/mcs7721_ssb_dim_mixed_outer_2colgrp2.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7721_ssb_dim_mixed_outer_2colgrp2.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7721_ssb_dim_mixed_outer_2colgrp2.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7721_ssb_dim_mixed_outer_2colgrp2.result diff --git a/mtr/csinternal/devregression/r/mcs7722_ssb_dim_mixed_outer_2colgrp12.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7722_ssb_dim_mixed_outer_2colgrp12.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7722_ssb_dim_mixed_outer_2colgrp12.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7722_ssb_dim_mixed_outer_2colgrp12.result diff --git a/mtr/csinternal/devregression/r/mcs7723_ssb_dim_mixed_outer_2colgrp11.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7723_ssb_dim_mixed_outer_2colgrp11.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7723_ssb_dim_mixed_outer_2colgrp11.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7723_ssb_dim_mixed_outer_2colgrp11.result diff --git a/mtr/csinternal/devregression/r/mcs7724_ssb_dim_mixed_outer_2colgrp10.result b/mysql-test/columnstore/csinternal/devregression/r/mcs7724_ssb_dim_mixed_outer_2colgrp10.result similarity index 100% rename from mtr/csinternal/devregression/r/mcs7724_ssb_dim_mixed_outer_2colgrp10.result rename to mysql-test/columnstore/csinternal/devregression/r/mcs7724_ssb_dim_mixed_outer_2colgrp10.result diff --git a/mtr/csinternal/devregression/t/mcs7000_regression_bug1632.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7000_regression_bug1632.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7000_regression_bug1632.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7000_regression_bug1632.test diff --git a/mtr/csinternal/devregression/t/mcs7001_regression_bug1796.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7001_regression_bug1796.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7001_regression_bug1796.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7001_regression_bug1796.test diff --git a/mtr/csinternal/devregression/t/mcs7002_regression_bug1903.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7002_regression_bug1903.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7002_regression_bug1903.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7002_regression_bug1903.test diff --git a/mtr/csinternal/devregression/t/mcs7003_regression_bug2549.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7003_regression_bug2549.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7003_regression_bug2549.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7003_regression_bug2549.test diff --git a/mtr/csinternal/devregression/t/mcs7004_regression_bug2577.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7004_regression_bug2577.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7004_regression_bug2577.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7004_regression_bug2577.test diff --git a/mtr/csinternal/devregression/t/mcs7005_regression_bug2589.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7005_regression_bug2589.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7005_regression_bug2589.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7005_regression_bug2589.test diff --git a/mtr/csinternal/devregression/t/mcs7006_regression_bug2595.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7006_regression_bug2595.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7006_regression_bug2595.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7006_regression_bug2595.test diff --git a/mtr/csinternal/devregression/t/mcs7007_regression_bug2657.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7007_regression_bug2657.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7007_regression_bug2657.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7007_regression_bug2657.test diff --git a/mtr/csinternal/devregression/t/mcs7008_regression_bug2712.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7008_regression_bug2712.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7008_regression_bug2712.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7008_regression_bug2712.test diff --git a/mtr/csinternal/devregression/t/mcs7009_regression_bug2732.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7009_regression_bug2732.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7009_regression_bug2732.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7009_regression_bug2732.test diff --git a/mtr/csinternal/devregression/t/mcs7010_regression_bug2741.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7010_regression_bug2741.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7010_regression_bug2741.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7010_regression_bug2741.test diff --git a/mtr/csinternal/devregression/t/mcs7011_regression_bug2762.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7011_regression_bug2762.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7011_regression_bug2762.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7011_regression_bug2762.test diff --git a/mtr/csinternal/devregression/t/mcs7012_regression_bug2788.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7012_regression_bug2788.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7012_regression_bug2788.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7012_regression_bug2788.test diff --git a/mtr/csinternal/devregression/t/mcs7013_regression_bug2810.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7013_regression_bug2810.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7013_regression_bug2810.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7013_regression_bug2810.test diff --git a/mtr/csinternal/devregression/t/mcs7014_regression_bug2813.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7014_regression_bug2813.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7014_regression_bug2813.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7014_regression_bug2813.test diff --git a/mtr/csinternal/devregression/t/mcs7015_regression_bug2835.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7015_regression_bug2835.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7015_regression_bug2835.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7015_regression_bug2835.test diff --git a/mtr/csinternal/devregression/t/mcs7016_regression_bug2838.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7016_regression_bug2838.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7016_regression_bug2838.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7016_regression_bug2838.test diff --git a/mtr/csinternal/devregression/t/mcs7017_regression_bug2845.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7017_regression_bug2845.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7017_regression_bug2845.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7017_regression_bug2845.test diff --git a/mtr/csinternal/devregression/t/mcs7018_regression_bug2873.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7018_regression_bug2873.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7018_regression_bug2873.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7018_regression_bug2873.test diff --git a/mtr/csinternal/devregression/t/mcs7019_regression_bug2876.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7019_regression_bug2876.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7019_regression_bug2876.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7019_regression_bug2876.test diff --git a/mtr/csinternal/devregression/t/mcs7020_regression_bug2884.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7020_regression_bug2884.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7020_regression_bug2884.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7020_regression_bug2884.test diff --git a/mtr/csinternal/devregression/t/mcs7021_regression_bug2892.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7021_regression_bug2892.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7021_regression_bug2892.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7021_regression_bug2892.test diff --git a/mtr/csinternal/devregression/t/mcs7022_regression_bug2907.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7022_regression_bug2907.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7022_regression_bug2907.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7022_regression_bug2907.test diff --git a/mtr/csinternal/devregression/t/mcs7023_regression_bug2909.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7023_regression_bug2909.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7023_regression_bug2909.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7023_regression_bug2909.test diff --git a/mtr/csinternal/devregression/t/mcs7024_regression_bug2911_negative.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7024_regression_bug2911_negative.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7024_regression_bug2911_negative.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7024_regression_bug2911_negative.test diff --git a/mtr/csinternal/devregression/t/mcs7025_regression_bug2912.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7025_regression_bug2912.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7025_regression_bug2912.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7025_regression_bug2912.test diff --git a/mtr/csinternal/devregression/t/mcs7026_regression_bug2915.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7026_regression_bug2915.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7026_regression_bug2915.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7026_regression_bug2915.test diff --git a/mtr/csinternal/devregression/t/mcs7027_regression_bug2919.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7027_regression_bug2919.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7027_regression_bug2919.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7027_regression_bug2919.test diff --git a/mtr/csinternal/devregression/t/mcs7028_regression_bug2922.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7028_regression_bug2922.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7028_regression_bug2922.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7028_regression_bug2922.test diff --git a/mtr/csinternal/devregression/t/mcs7029_regression_bug2924.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7029_regression_bug2924.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7029_regression_bug2924.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7029_regression_bug2924.test diff --git a/mtr/csinternal/devregression/t/mcs7030_regression_bug2928.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7030_regression_bug2928.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7030_regression_bug2928.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7030_regression_bug2928.test diff --git a/mtr/csinternal/devregression/t/mcs7031_regression_bug2932.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7031_regression_bug2932.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7031_regression_bug2932.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7031_regression_bug2932.test diff --git a/mtr/csinternal/devregression/t/mcs7032_regression_bug2938.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7032_regression_bug2938.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7032_regression_bug2938.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7032_regression_bug2938.test diff --git a/mtr/csinternal/devregression/t/mcs7033_regression_bug2954.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7033_regression_bug2954.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7033_regression_bug2954.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7033_regression_bug2954.test diff --git a/mtr/csinternal/devregression/t/mcs7034_regression_bug2961.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7034_regression_bug2961.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7034_regression_bug2961.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7034_regression_bug2961.test diff --git a/mtr/csinternal/devregression/t/mcs7035_regression_bug2976.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7035_regression_bug2976.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7035_regression_bug2976.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7035_regression_bug2976.test diff --git a/mtr/csinternal/devregression/t/mcs7036_regression_bug2992.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7036_regression_bug2992.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7036_regression_bug2992.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7036_regression_bug2992.test diff --git a/mtr/csinternal/devregression/t/mcs7037_regression_bug3002.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7037_regression_bug3002.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7037_regression_bug3002.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7037_regression_bug3002.test diff --git a/mtr/csinternal/devregression/t/mcs7038_regression_bug3003.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7038_regression_bug3003.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7038_regression_bug3003.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7038_regression_bug3003.test diff --git a/mtr/csinternal/devregression/t/mcs7039_regression_bug3007.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7039_regression_bug3007.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7039_regression_bug3007.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7039_regression_bug3007.test diff --git a/mtr/csinternal/devregression/t/mcs7040_regression_bug3012.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7040_regression_bug3012.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7040_regression_bug3012.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7040_regression_bug3012.test diff --git a/mtr/csinternal/devregression/t/mcs7041_regression_bug3019.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7041_regression_bug3019.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7041_regression_bug3019.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7041_regression_bug3019.test diff --git a/mtr/csinternal/devregression/t/mcs7042_regression_bug3021.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7042_regression_bug3021.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7042_regression_bug3021.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7042_regression_bug3021.test diff --git a/mtr/csinternal/devregression/t/mcs7043_regression_bug3024.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7043_regression_bug3024.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7043_regression_bug3024.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7043_regression_bug3024.test diff --git a/mtr/csinternal/devregression/t/mcs7044_regression_bug3025.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7044_regression_bug3025.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7044_regression_bug3025.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7044_regression_bug3025.test diff --git a/mtr/csinternal/devregression/t/mcs7045_regression_bug3051.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7045_regression_bug3051.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7045_regression_bug3051.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7045_regression_bug3051.test diff --git a/mtr/csinternal/devregression/t/mcs7046_regression_bug3058.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7046_regression_bug3058.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7046_regression_bug3058.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7046_regression_bug3058.test diff --git a/mtr/csinternal/devregression/t/mcs7047_regression_bug3067.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7047_regression_bug3067.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7047_regression_bug3067.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7047_regression_bug3067.test diff --git a/mtr/csinternal/devregression/t/mcs7048_regression_bug3076.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7048_regression_bug3076.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7048_regression_bug3076.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7048_regression_bug3076.test diff --git a/mtr/csinternal/devregression/t/mcs7049_regression_bug3129.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7049_regression_bug3129.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7049_regression_bug3129.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7049_regression_bug3129.test diff --git a/mtr/csinternal/devregression/t/mcs7050_regression_bug3137.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7050_regression_bug3137.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7050_regression_bug3137.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7050_regression_bug3137.test diff --git a/mtr/csinternal/devregression/t/mcs7051_regression_bug3167.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7051_regression_bug3167.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7051_regression_bug3167.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7051_regression_bug3167.test diff --git a/mtr/csinternal/devregression/t/mcs7052_regression_bug3181.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7052_regression_bug3181.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7052_regression_bug3181.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7052_regression_bug3181.test diff --git a/mtr/csinternal/devregression/t/mcs7053_regression_bug3193.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7053_regression_bug3193.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7053_regression_bug3193.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7053_regression_bug3193.test diff --git a/mtr/csinternal/devregression/t/mcs7054_regression_bug3194.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7054_regression_bug3194.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7054_regression_bug3194.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7054_regression_bug3194.test diff --git a/mtr/csinternal/devregression/t/mcs7055_regression_bug3203.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7055_regression_bug3203.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7055_regression_bug3203.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7055_regression_bug3203.test diff --git a/mtr/csinternal/devregression/t/mcs7056_regression_bug3229.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7056_regression_bug3229.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7056_regression_bug3229.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7056_regression_bug3229.test diff --git a/mtr/csinternal/devregression/t/mcs7057_regression_bug3258.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7057_regression_bug3258.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7057_regression_bug3258.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7057_regression_bug3258.test diff --git a/mtr/csinternal/devregression/t/mcs7058_regression_bug3262.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7058_regression_bug3262.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7058_regression_bug3262.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7058_regression_bug3262.test diff --git a/mtr/csinternal/devregression/t/mcs7059_regression_bug3267.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7059_regression_bug3267.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7059_regression_bug3267.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7059_regression_bug3267.test diff --git a/mtr/csinternal/devregression/t/mcs7060_regression_bug3270.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7060_regression_bug3270.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7060_regression_bug3270.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7060_regression_bug3270.test diff --git a/mtr/csinternal/devregression/t/mcs7061_regression_bug3272.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7061_regression_bug3272.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7061_regression_bug3272.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7061_regression_bug3272.test diff --git a/mtr/csinternal/devregression/t/mcs7062_regression_bug3274.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7062_regression_bug3274.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7062_regression_bug3274.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7062_regression_bug3274.test diff --git a/mtr/csinternal/devregression/t/mcs7063_regression_bug3279.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7063_regression_bug3279.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7063_regression_bug3279.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7063_regression_bug3279.test diff --git a/mtr/csinternal/devregression/t/mcs7064_regression_bug3283.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7064_regression_bug3283.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7064_regression_bug3283.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7064_regression_bug3283.test diff --git a/mtr/csinternal/devregression/t/mcs7065_regression_bug3292.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7065_regression_bug3292.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7065_regression_bug3292.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7065_regression_bug3292.test diff --git a/mtr/csinternal/devregression/t/mcs7066_regression_bug3295.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7066_regression_bug3295.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7066_regression_bug3295.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7066_regression_bug3295.test diff --git a/mtr/csinternal/devregression/t/mcs7067_regression_bug3312.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7067_regression_bug3312.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7067_regression_bug3312.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7067_regression_bug3312.test diff --git a/mtr/csinternal/devregression/t/mcs7068_regression_bug3314.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7068_regression_bug3314.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7068_regression_bug3314.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7068_regression_bug3314.test diff --git a/mtr/csinternal/devregression/t/mcs7069_regression_bug3331.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7069_regression_bug3331.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7069_regression_bug3331.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7069_regression_bug3331.test diff --git a/mtr/csinternal/devregression/t/mcs7070_regression_bug3333.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7070_regression_bug3333.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7070_regression_bug3333.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7070_regression_bug3333.test diff --git a/mtr/csinternal/devregression/t/mcs7071_regression_bug3334_ceil.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7071_regression_bug3334_ceil.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7071_regression_bug3334_ceil.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7071_regression_bug3334_ceil.test diff --git a/mtr/csinternal/devregression/t/mcs7072_regression_bug3406.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7072_regression_bug3406.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7072_regression_bug3406.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7072_regression_bug3406.test diff --git a/mtr/csinternal/devregression/t/mcs7073_regression_bug3338.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7073_regression_bug3338.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7073_regression_bug3338.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7073_regression_bug3338.test diff --git a/mtr/csinternal/devregression/t/mcs7074_regression_bug3344.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7074_regression_bug3344.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7074_regression_bug3344.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7074_regression_bug3344.test diff --git a/mtr/csinternal/devregression/t/mcs7075_regression_bug3381.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7075_regression_bug3381.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7075_regression_bug3381.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7075_regression_bug3381.test diff --git a/mtr/csinternal/devregression/t/mcs7076_regression_bug3398.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7076_regression_bug3398.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7076_regression_bug3398.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7076_regression_bug3398.test diff --git a/mtr/csinternal/devregression/t/mcs7077_regression_bug3414.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7077_regression_bug3414.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7077_regression_bug3414.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7077_regression_bug3414.test diff --git a/mtr/csinternal/devregression/t/mcs7078_regression_bug3436.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7078_regression_bug3436.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7078_regression_bug3436.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7078_regression_bug3436.test diff --git a/mtr/csinternal/devregression/t/mcs7079_regression_bug3442.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7079_regression_bug3442.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7079_regression_bug3442.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7079_regression_bug3442.test diff --git a/mtr/csinternal/devregression/t/mcs7080_regression_bug3443.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7080_regression_bug3443.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7080_regression_bug3443.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7080_regression_bug3443.test diff --git a/mtr/csinternal/devregression/t/mcs7081_regression_bug3458.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7081_regression_bug3458.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7081_regression_bug3458.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7081_regression_bug3458.test diff --git a/mtr/csinternal/devregression/t/mcs7082_regression_bug3475.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7082_regression_bug3475.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7082_regression_bug3475.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7082_regression_bug3475.test diff --git a/mtr/csinternal/devregression/t/mcs7083_regression_bug3477.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7083_regression_bug3477.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7083_regression_bug3477.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7083_regression_bug3477.test diff --git a/mtr/csinternal/devregression/t/mcs7084_regression_bug3482.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7084_regression_bug3482.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7084_regression_bug3482.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7084_regression_bug3482.test diff --git a/mtr/csinternal/devregression/t/mcs7085_regression_bug3483.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7085_regression_bug3483.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7085_regression_bug3483.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7085_regression_bug3483.test diff --git a/mtr/csinternal/devregression/t/mcs7086_regression_bug3484.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7086_regression_bug3484.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7086_regression_bug3484.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7086_regression_bug3484.test diff --git a/mtr/csinternal/devregression/t/mcs7087_regression_bug3488.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7087_regression_bug3488.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7087_regression_bug3488.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7087_regression_bug3488.test diff --git a/mtr/csinternal/devregression/t/mcs7088_regression_bug3492.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7088_regression_bug3492.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7088_regression_bug3492.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7088_regression_bug3492.test diff --git a/mtr/csinternal/devregression/t/mcs7089_regression_bug3496.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7089_regression_bug3496.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7089_regression_bug3496.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7089_regression_bug3496.test diff --git a/mtr/csinternal/devregression/t/mcs7090_regression_bug3497.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7090_regression_bug3497.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7090_regression_bug3497.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7090_regression_bug3497.test diff --git a/mtr/csinternal/devregression/t/mcs7091_regression_bug3506.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7091_regression_bug3506.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7091_regression_bug3506.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7091_regression_bug3506.test diff --git a/mtr/csinternal/devregression/t/mcs7092_regression_bug3509.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7092_regression_bug3509.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7092_regression_bug3509.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7092_regression_bug3509.test diff --git a/mtr/csinternal/devregression/t/mcs7093_regression_bug3518_negative.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7093_regression_bug3518_negative.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7093_regression_bug3518_negative.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7093_regression_bug3518_negative.test diff --git a/mtr/csinternal/devregression/t/mcs7094_regression_bug3520.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7094_regression_bug3520.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7094_regression_bug3520.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7094_regression_bug3520.test diff --git a/mtr/csinternal/devregression/t/mcs7095_regression_bug3522.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7095_regression_bug3522.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7095_regression_bug3522.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7095_regression_bug3522.test diff --git a/mtr/csinternal/devregression/t/mcs7096_regression_bug3523.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7096_regression_bug3523.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7096_regression_bug3523.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7096_regression_bug3523.test diff --git a/mtr/csinternal/devregression/t/mcs7097_regression_bug3524.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7097_regression_bug3524.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7097_regression_bug3524.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7097_regression_bug3524.test diff --git a/mtr/csinternal/devregression/t/mcs7098_regression_bug3532.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7098_regression_bug3532.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7098_regression_bug3532.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7098_regression_bug3532.test diff --git a/mtr/csinternal/devregression/t/mcs7099_regression_bug3554.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7099_regression_bug3554.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7099_regression_bug3554.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7099_regression_bug3554.test diff --git a/mtr/csinternal/devregression/t/mcs7100_regression_bug3563.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7100_regression_bug3563.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7100_regression_bug3563.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7100_regression_bug3563.test diff --git a/mtr/csinternal/devregression/t/mcs7101_regression_bug3565.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7101_regression_bug3565.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7101_regression_bug3565.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7101_regression_bug3565.test diff --git a/mtr/csinternal/devregression/t/mcs7102_regression_bug3570.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7102_regression_bug3570.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7102_regression_bug3570.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7102_regression_bug3570.test diff --git a/mtr/csinternal/devregression/t/mcs7103_regression_bug3582.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7103_regression_bug3582.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7103_regression_bug3582.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7103_regression_bug3582.test diff --git a/mtr/csinternal/devregression/t/mcs7104_regression_bug3584.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7104_regression_bug3584.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7104_regression_bug3584.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7104_regression_bug3584.test diff --git a/mtr/csinternal/devregression/t/mcs7105_regression_bug3585.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7105_regression_bug3585.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7105_regression_bug3585.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7105_regression_bug3585.test diff --git a/mtr/csinternal/devregression/t/mcs7106_regression_bug3669.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7106_regression_bug3669.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7106_regression_bug3669.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7106_regression_bug3669.test diff --git a/mtr/csinternal/devregression/t/mcs7107_regression_bug3670_negative.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7107_regression_bug3670_negative.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7107_regression_bug3670_negative.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7107_regression_bug3670_negative.test diff --git a/mtr/csinternal/devregression/t/mcs7108_regression_bug3671.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7108_regression_bug3671.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7108_regression_bug3671.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7108_regression_bug3671.test diff --git a/mtr/csinternal/devregression/t/mcs7109_regression_bug3680.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7109_regression_bug3680.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7109_regression_bug3680.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7109_regression_bug3680.test diff --git a/mtr/csinternal/devregression/t/mcs7110_regression_bug3682.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7110_regression_bug3682.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7110_regression_bug3682.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7110_regression_bug3682.test diff --git a/mtr/csinternal/devregression/t/mcs7111_regression_bug3706.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7111_regression_bug3706.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7111_regression_bug3706.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7111_regression_bug3706.test diff --git a/mtr/csinternal/devregression/t/mcs7112_regression_bug3708.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7112_regression_bug3708.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7112_regression_bug3708.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7112_regression_bug3708.test diff --git a/mtr/csinternal/devregression/t/mcs7113_regression_bug3719.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7113_regression_bug3719.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7113_regression_bug3719.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7113_regression_bug3719.test diff --git a/mtr/csinternal/devregression/t/mcs7114_regression_bug3720.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7114_regression_bug3720.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7114_regression_bug3720.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7114_regression_bug3720.test diff --git a/mtr/csinternal/devregression/t/mcs7115_regression_bug3728.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7115_regression_bug3728.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7115_regression_bug3728.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7115_regression_bug3728.test diff --git a/mtr/csinternal/devregression/t/mcs7116_regression_bug3731.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7116_regression_bug3731.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7116_regression_bug3731.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7116_regression_bug3731.test diff --git a/mtr/csinternal/devregression/t/mcs7117_regression_bug3736.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7117_regression_bug3736.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7117_regression_bug3736.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7117_regression_bug3736.test diff --git a/mtr/csinternal/devregression/t/mcs7118_regression_bug3749.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7118_regression_bug3749.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7118_regression_bug3749.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7118_regression_bug3749.test diff --git a/mtr/csinternal/devregression/t/mcs7119_regression_bug3752.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7119_regression_bug3752.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7119_regression_bug3752.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7119_regression_bug3752.test diff --git a/mtr/csinternal/devregression/t/mcs7120_regression_bug3761.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7120_regression_bug3761.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7120_regression_bug3761.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7120_regression_bug3761.test diff --git a/mtr/csinternal/devregression/t/mcs7121_regression_bug3783.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7121_regression_bug3783.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7121_regression_bug3783.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7121_regression_bug3783.test diff --git a/mtr/csinternal/devregression/t/mcs7122_regression_bug3788.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7122_regression_bug3788.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7122_regression_bug3788.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7122_regression_bug3788.test diff --git a/mtr/csinternal/devregression/t/mcs7123_regression_bug3792_negative.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7123_regression_bug3792_negative.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7123_regression_bug3792_negative.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7123_regression_bug3792_negative.test diff --git a/mtr/csinternal/devregression/t/mcs7124_regression_bug3798.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7124_regression_bug3798.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7124_regression_bug3798.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7124_regression_bug3798.test diff --git a/mtr/csinternal/devregression/t/mcs7125_regression_bug3819.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7125_regression_bug3819.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7125_regression_bug3819.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7125_regression_bug3819.test diff --git a/mtr/csinternal/devregression/t/mcs7126_regression_bug3853.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7126_regression_bug3853.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7126_regression_bug3853.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7126_regression_bug3853.test diff --git a/mtr/csinternal/devregression/t/mcs7127_regression_bug3881.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7127_regression_bug3881.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7127_regression_bug3881.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7127_regression_bug3881.test diff --git a/mtr/csinternal/devregression/t/mcs7128_regression_bug3911.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7128_regression_bug3911.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7128_regression_bug3911.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7128_regression_bug3911.test diff --git a/mtr/csinternal/devregression/t/mcs7129_regression_bug3932.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7129_regression_bug3932.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7129_regression_bug3932.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7129_regression_bug3932.test diff --git a/mtr/csinternal/devregression/t/mcs7130_regression_bug3935.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7130_regression_bug3935.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7130_regression_bug3935.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7130_regression_bug3935.test diff --git a/mtr/csinternal/devregression/t/mcs7131_regression_bug3948.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7131_regression_bug3948.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7131_regression_bug3948.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7131_regression_bug3948.test diff --git a/mtr/csinternal/devregression/t/mcs7132_regression_bug3952.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7132_regression_bug3952.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7132_regression_bug3952.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7132_regression_bug3952.test diff --git a/mtr/csinternal/devregression/t/mcs7133_regression_bug3961.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7133_regression_bug3961.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7133_regression_bug3961.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7133_regression_bug3961.test diff --git a/mtr/csinternal/devregression/t/mcs7134_regression_bug3997.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7134_regression_bug3997.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7134_regression_bug3997.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7134_regression_bug3997.test diff --git a/mtr/csinternal/devregression/t/mcs7135_regression_bug3998.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7135_regression_bug3998.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7135_regression_bug3998.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7135_regression_bug3998.test diff --git a/mtr/csinternal/devregression/t/mcs7136_regression_bug4027.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7136_regression_bug4027.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7136_regression_bug4027.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7136_regression_bug4027.test diff --git a/mtr/csinternal/devregression/t/mcs7137_regression_bug4031.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7137_regression_bug4031.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7137_regression_bug4031.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7137_regression_bug4031.test diff --git a/mtr/csinternal/devregression/t/mcs7138_regression_bug4033.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7138_regression_bug4033.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7138_regression_bug4033.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7138_regression_bug4033.test diff --git a/mtr/csinternal/devregression/t/mcs7139_regression_bug4074.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7139_regression_bug4074.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7139_regression_bug4074.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7139_regression_bug4074.test diff --git a/mtr/csinternal/devregression/t/mcs7140_regression_bug4215.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7140_regression_bug4215.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7140_regression_bug4215.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7140_regression_bug4215.test diff --git a/mtr/csinternal/devregression/t/mcs7141_regression_bug4222.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7141_regression_bug4222.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7141_regression_bug4222.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7141_regression_bug4222.test diff --git a/mtr/csinternal/devregression/t/mcs7142_regression_bug4250.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7142_regression_bug4250.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7142_regression_bug4250.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7142_regression_bug4250.test diff --git a/mtr/csinternal/devregression/t/mcs7143_regression_bug4346.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7143_regression_bug4346.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7143_regression_bug4346.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7143_regression_bug4346.test diff --git a/mtr/csinternal/devregression/t/mcs7144_regression_bug4359.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7144_regression_bug4359.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7144_regression_bug4359.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7144_regression_bug4359.test diff --git a/mtr/csinternal/devregression/t/mcs7145_regression_bug4373.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7145_regression_bug4373.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7145_regression_bug4373.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7145_regression_bug4373.test diff --git a/mtr/csinternal/devregression/t/mcs7146_regression_bug4386.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7146_regression_bug4386.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7146_regression_bug4386.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7146_regression_bug4386.test diff --git a/mtr/csinternal/devregression/t/mcs7147_regression_bug4388.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7147_regression_bug4388.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7147_regression_bug4388.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7147_regression_bug4388.test diff --git a/mtr/csinternal/devregression/t/mcs7148_regression_bug4391.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7148_regression_bug4391.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7148_regression_bug4391.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7148_regression_bug4391.test diff --git a/mtr/csinternal/devregression/t/mcs7149_regression_bug4394.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7149_regression_bug4394.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7149_regression_bug4394.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7149_regression_bug4394.test diff --git a/mtr/csinternal/devregression/t/mcs7150_regression_bug4422.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7150_regression_bug4422.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7150_regression_bug4422.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7150_regression_bug4422.test diff --git a/mtr/csinternal/devregression/t/mcs7151_regression_bug4431.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7151_regression_bug4431.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7151_regression_bug4431.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7151_regression_bug4431.test diff --git a/mtr/csinternal/devregression/t/mcs7152_regression_bug4457.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7152_regression_bug4457.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7152_regression_bug4457.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7152_regression_bug4457.test diff --git a/mtr/csinternal/devregression/t/mcs7153_regression_bug4488.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7153_regression_bug4488.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7153_regression_bug4488.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7153_regression_bug4488.test diff --git a/mtr/csinternal/devregression/t/mcs7154_regression_bug4509.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7154_regression_bug4509.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7154_regression_bug4509.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7154_regression_bug4509.test diff --git a/mtr/csinternal/devregression/t/mcs7155_regression_bug4543.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7155_regression_bug4543.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7155_regression_bug4543.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7155_regression_bug4543.test diff --git a/mtr/csinternal/devregression/t/mcs7156_regression_bug4703.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7156_regression_bug4703.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7156_regression_bug4703.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7156_regression_bug4703.test diff --git a/mtr/csinternal/devregression/t/mcs7157_regression_bug4757.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7157_regression_bug4757.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7157_regression_bug4757.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7157_regression_bug4757.test diff --git a/mtr/csinternal/devregression/t/mcs7158_regression_bug4767.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7158_regression_bug4767.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7158_regression_bug4767.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7158_regression_bug4767.test diff --git a/mtr/csinternal/devregression/t/mcs7159_regression_bug4827.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7159_regression_bug4827.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7159_regression_bug4827.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7159_regression_bug4827.test diff --git a/mtr/csinternal/devregression/t/mcs7160_regression_bug4848.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7160_regression_bug4848.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7160_regression_bug4848.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7160_regression_bug4848.test diff --git a/mtr/csinternal/devregression/t/mcs7161_regression_bug4947.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7161_regression_bug4947.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7161_regression_bug4947.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7161_regression_bug4947.test diff --git a/mtr/csinternal/devregression/t/mcs7162_regression_bug5044.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7162_regression_bug5044.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7162_regression_bug5044.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7162_regression_bug5044.test diff --git a/mtr/csinternal/devregression/t/mcs7163_regression_bug5091.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7163_regression_bug5091.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7163_regression_bug5091.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7163_regression_bug5091.test diff --git a/mtr/csinternal/devregression/t/mcs7164_regression_bug5096.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7164_regression_bug5096.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7164_regression_bug5096.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7164_regression_bug5096.test diff --git a/mtr/csinternal/devregression/t/mcs7165_regression_bug5098.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7165_regression_bug5098.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7165_regression_bug5098.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7165_regression_bug5098.test diff --git a/mtr/csinternal/devregression/t/mcs7166_regression_bug5099.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7166_regression_bug5099.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7166_regression_bug5099.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7166_regression_bug5099.test diff --git a/mtr/csinternal/devregression/t/mcs7167_regression_bug5133.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7167_regression_bug5133.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7167_regression_bug5133.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7167_regression_bug5133.test diff --git a/mtr/csinternal/devregression/t/mcs7168_regression_bug5173.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7168_regression_bug5173.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7168_regression_bug5173.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7168_regression_bug5173.test diff --git a/mtr/csinternal/devregression/t/mcs7169_regression_bug5176.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7169_regression_bug5176.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7169_regression_bug5176.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7169_regression_bug5176.test diff --git a/mtr/csinternal/devregression/t/mcs7170_regression_bug5228.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7170_regression_bug5228.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7170_regression_bug5228.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7170_regression_bug5228.test diff --git a/mtr/csinternal/devregression/t/mcs7171_regression_bug5229.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7171_regression_bug5229.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7171_regression_bug5229.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7171_regression_bug5229.test diff --git a/mtr/csinternal/devregression/t/mcs7172_regression_bug5230.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7172_regression_bug5230.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7172_regression_bug5230.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7172_regression_bug5230.test diff --git a/mtr/csinternal/devregression/t/mcs7173_regression_bug5267.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7173_regression_bug5267.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7173_regression_bug5267.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7173_regression_bug5267.test diff --git a/mtr/csinternal/devregression/t/mcs7174_regression_bug5286.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7174_regression_bug5286.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7174_regression_bug5286.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7174_regression_bug5286.test diff --git a/mtr/csinternal/devregression/t/mcs7175_regression_bug5289.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7175_regression_bug5289.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7175_regression_bug5289.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7175_regression_bug5289.test diff --git a/mtr/csinternal/devregression/t/mcs7176_regression_bug5311.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7176_regression_bug5311.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7176_regression_bug5311.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7176_regression_bug5311.test diff --git a/mtr/csinternal/devregression/t/mcs7177_regression_bug5319.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7177_regression_bug5319.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7177_regression_bug5319.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7177_regression_bug5319.test diff --git a/mtr/csinternal/devregression/t/mcs7178_regression_bug5345.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7178_regression_bug5345.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7178_regression_bug5345.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7178_regression_bug5345.test diff --git a/mtr/csinternal/devregression/t/mcs7179_regression_bug5366.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7179_regression_bug5366.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7179_regression_bug5366.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7179_regression_bug5366.test diff --git a/mtr/csinternal/devregression/t/mcs7180_regression_bug5374.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7180_regression_bug5374.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7180_regression_bug5374.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7180_regression_bug5374.test diff --git a/mtr/csinternal/devregression/t/mcs7181_regression_bug5448.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7181_regression_bug5448.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7181_regression_bug5448.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7181_regression_bug5448.test diff --git a/mtr/csinternal/devregression/t/mcs7182_regression_bug5687.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7182_regression_bug5687.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7182_regression_bug5687.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7182_regression_bug5687.test diff --git a/mtr/csinternal/devregression/t/mcs7183_regression_bug5712.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7183_regression_bug5712.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7183_regression_bug5712.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7183_regression_bug5712.test diff --git a/mtr/csinternal/devregression/t/mcs7184_regression_bug5715.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7184_regression_bug5715.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7184_regression_bug5715.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7184_regression_bug5715.test diff --git a/mtr/csinternal/devregression/t/mcs7185_regression_bug5764b.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7185_regression_bug5764b.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7185_regression_bug5764b.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7185_regression_bug5764b.test diff --git a/mtr/csinternal/devregression/t/mcs7186_regression_bug5764.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7186_regression_bug5764.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7186_regression_bug5764.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7186_regression_bug5764.test diff --git a/mtr/csinternal/devregression/t/mcs7187_regression_bug5777.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7187_regression_bug5777.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7187_regression_bug5777.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7187_regression_bug5777.test diff --git a/mtr/csinternal/devregression/t/mcs7188_regression_bug5805.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7188_regression_bug5805.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7188_regression_bug5805.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7188_regression_bug5805.test diff --git a/mtr/csinternal/devregression/t/mcs7189_regression_bug5820.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7189_regression_bug5820.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7189_regression_bug5820.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7189_regression_bug5820.test diff --git a/mtr/csinternal/devregression/t/mcs7190_regression_bug5932.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7190_regression_bug5932.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7190_regression_bug5932.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7190_regression_bug5932.test diff --git a/mtr/csinternal/devregression/t/mcs7191_regression_bug5976.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7191_regression_bug5976.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7191_regression_bug5976.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7191_regression_bug5976.test diff --git a/mtr/csinternal/devregression/t/mcs7192_regression_bug6065.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7192_regression_bug6065.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7192_regression_bug6065.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7192_regression_bug6065.test diff --git a/mtr/csinternal/devregression/t/mcs7193_regression_bug6113.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7193_regression_bug6113.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7193_regression_bug6113.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7193_regression_bug6113.test diff --git a/mtr/csinternal/devregression/t/mcs7194_regression_bug6126.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7194_regression_bug6126.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7194_regression_bug6126.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7194_regression_bug6126.test diff --git a/mtr/csinternal/devregression/t/mcs7195_regression_bug6134.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7195_regression_bug6134.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7195_regression_bug6134.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7195_regression_bug6134.test diff --git a/mtr/csinternal/devregression/t/mcs7196_regression_bug752.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7196_regression_bug752.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7196_regression_bug752.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7196_regression_bug752.test diff --git a/mtr/csinternal/devregression/t/mcs7197_regression_MCOL-1234.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7197_regression_MCOL-1234.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7197_regression_MCOL-1234.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7197_regression_MCOL-1234.test diff --git a/mtr/csinternal/devregression/t/mcs7198_regression_MCOL-1246.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7198_regression_MCOL-1246.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7198_regression_MCOL-1246.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7198_regression_MCOL-1246.test diff --git a/mtr/csinternal/devregression/t/mcs7199_regression_MCOL-128.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7199_regression_MCOL-128.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7199_regression_MCOL-128.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7199_regression_MCOL-128.test diff --git a/mtr/csinternal/devregression/t/mcs7200_regression_MCOL-1403.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7200_regression_MCOL-1403.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7200_regression_MCOL-1403.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7200_regression_MCOL-1403.test diff --git a/mtr/csinternal/devregression/t/mcs7201_regression_MCOL-1531.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7201_regression_MCOL-1531.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7201_regression_MCOL-1531.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7201_regression_MCOL-1531.test diff --git a/mtr/csinternal/devregression/t/mcs7202_regression_MCOL-1535.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7202_regression_MCOL-1535.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7202_regression_MCOL-1535.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7202_regression_MCOL-1535.test diff --git a/mtr/csinternal/devregression/t/mcs7203_regression_MCOL-1559.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7203_regression_MCOL-1559.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7203_regression_MCOL-1559.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7203_regression_MCOL-1559.test diff --git a/mtr/csinternal/devregression/t/mcs7204_regression_MCOL-163.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7204_regression_MCOL-163.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7204_regression_MCOL-163.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7204_regression_MCOL-163.test diff --git a/mtr/csinternal/devregression/t/mcs7205_regression_MCOL-1662.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7205_regression_MCOL-1662.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7205_regression_MCOL-1662.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7205_regression_MCOL-1662.test diff --git a/mtr/csinternal/devregression/t/mcs7206_regression_MCOL-1676.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7206_regression_MCOL-1676.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7206_regression_MCOL-1676.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7206_regression_MCOL-1676.test diff --git a/mtr/csinternal/devregression/t/mcs7207_regression_MCOL-1829.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7207_regression_MCOL-1829.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7207_regression_MCOL-1829.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7207_regression_MCOL-1829.test diff --git a/mtr/csinternal/devregression/t/mcs7208_regression_MCOL-1989.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7208_regression_MCOL-1989.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7208_regression_MCOL-1989.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7208_regression_MCOL-1989.test diff --git a/mtr/csinternal/devregression/t/mcs7209_regression_MCOL-2050.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7209_regression_MCOL-2050.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7209_regression_MCOL-2050.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7209_regression_MCOL-2050.test diff --git a/mtr/csinternal/devregression/t/mcs7210_regression_MCOL-2091.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7210_regression_MCOL-2091.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7210_regression_MCOL-2091.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7210_regression_MCOL-2091.test diff --git a/mtr/csinternal/devregression/t/mcs7211_regression_MCOL-2096.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7211_regression_MCOL-2096.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7211_regression_MCOL-2096.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7211_regression_MCOL-2096.test diff --git a/mtr/csinternal/devregression/t/mcs7212_regression_MCOL-2139.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7212_regression_MCOL-2139.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7212_regression_MCOL-2139.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7212_regression_MCOL-2139.test diff --git a/mtr/csinternal/devregression/t/mcs7213_regression_MCOL-2225.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7213_regression_MCOL-2225.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7213_regression_MCOL-2225.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7213_regression_MCOL-2225.test diff --git a/mtr/csinternal/devregression/t/mcs7214_regression_MCOL-2267.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7214_regression_MCOL-2267.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7214_regression_MCOL-2267.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7214_regression_MCOL-2267.test diff --git a/mtr/csinternal/devregression/t/mcs7215_regression_MCOL-3267.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7215_regression_MCOL-3267.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7215_regression_MCOL-3267.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7215_regression_MCOL-3267.test diff --git a/mtr/csinternal/devregression/t/mcs7216_regression_MCOL-3304.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7216_regression_MCOL-3304.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7216_regression_MCOL-3304.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7216_regression_MCOL-3304.test diff --git a/mtr/csinternal/devregression/t/mcs7217_regression_MCOL-3317.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7217_regression_MCOL-3317.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7217_regression_MCOL-3317.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7217_regression_MCOL-3317.test diff --git a/mtr/csinternal/devregression/t/mcs7218_regression_MCOL-3343.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7218_regression_MCOL-3343.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7218_regression_MCOL-3343.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7218_regression_MCOL-3343.test diff --git a/mtr/csinternal/devregression/t/mcs7219_regression_MCOL-3395.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7219_regression_MCOL-3395.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7219_regression_MCOL-3395.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7219_regression_MCOL-3395.test diff --git a/mtr/csinternal/devregression/t/mcs7220_regression_MCOL-3423.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7220_regression_MCOL-3423.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7220_regression_MCOL-3423.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7220_regression_MCOL-3423.test diff --git a/mtr/csinternal/devregression/t/mcs7221_regression_MCOL-3434.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7221_regression_MCOL-3434.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7221_regression_MCOL-3434.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7221_regression_MCOL-3434.test diff --git a/mtr/csinternal/devregression/t/mcs7222_regression_MCOL-3448.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7222_regression_MCOL-3448.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7222_regression_MCOL-3448.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7222_regression_MCOL-3448.test diff --git a/mtr/csinternal/devregression/t/mcs7223_regression_MCOL-3485.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7223_regression_MCOL-3485.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7223_regression_MCOL-3485.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7223_regression_MCOL-3485.test diff --git a/mtr/csinternal/devregression/t/mcs7224_regression_MCOL-3503.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7224_regression_MCOL-3503.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7224_regression_MCOL-3503.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7224_regression_MCOL-3503.test diff --git a/mtr/csinternal/devregression/t/mcs7225_regression_MCOL-3721.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7225_regression_MCOL-3721.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7225_regression_MCOL-3721.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7225_regression_MCOL-3721.test diff --git a/mtr/csinternal/devregression/t/mcs7226_regression_MCOL_3747.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7226_regression_MCOL_3747.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7226_regression_MCOL_3747.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7226_regression_MCOL_3747.test diff --git a/mtr/csinternal/devregression/t/mcs7227_regression_MCOL-3766.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7227_regression_MCOL-3766.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7227_regression_MCOL-3766.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7227_regression_MCOL-3766.test diff --git a/mtr/csinternal/devregression/t/mcs7228_regression_MCOL-3813.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7228_regression_MCOL-3813.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7228_regression_MCOL-3813.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7228_regression_MCOL-3813.test diff --git a/mtr/csinternal/devregression/t/mcs7229_regression_MCOL-3839.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7229_regression_MCOL-3839.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7229_regression_MCOL-3839.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7229_regression_MCOL-3839.test diff --git a/mtr/csinternal/devregression/t/mcs7230_regression_MCOL-4000.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7230_regression_MCOL-4000.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7230_regression_MCOL-4000.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7230_regression_MCOL-4000.test diff --git a/mtr/csinternal/devregression/t/mcs7231_regression_MCOL-4002.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7231_regression_MCOL-4002.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7231_regression_MCOL-4002.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7231_regression_MCOL-4002.test diff --git a/mtr/csinternal/devregression/t/mcs7232_regression_MCOL-4126.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7232_regression_MCOL-4126.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7232_regression_MCOL-4126.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7232_regression_MCOL-4126.test diff --git a/mtr/csinternal/devregression/t/mcs7233_regression_MCOL-477.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7233_regression_MCOL-477.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7233_regression_MCOL-477.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7233_regression_MCOL-477.test diff --git a/mtr/csinternal/devregression/t/mcs7234_regression_MCOL-656.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7234_regression_MCOL-656.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7234_regression_MCOL-656.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7234_regression_MCOL-656.test diff --git a/mtr/csinternal/devregression/t/mcs7235_regression_MCOL-657.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7235_regression_MCOL-657.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7235_regression_MCOL-657.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7235_regression_MCOL-657.test diff --git a/mtr/csinternal/devregression/t/mcs7236_regression_MCOL-736.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7236_regression_MCOL-736.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7236_regression_MCOL-736.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7236_regression_MCOL-736.test diff --git a/mtr/csinternal/devregression/t/mcs7237_regression_MCOL-812.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7237_regression_MCOL-812.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7237_regression_MCOL-812.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7237_regression_MCOL-812.test diff --git a/mtr/csinternal/devregression/t/mcs7238_regression_MCOL-830.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7238_regression_MCOL-830.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7238_regression_MCOL-830.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7238_regression_MCOL-830.test diff --git a/mtr/csinternal/devregression/t/mcs7239_regression_MCOL-979.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7239_regression_MCOL-979.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7239_regression_MCOL-979.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7239_regression_MCOL-979.test diff --git a/mtr/csinternal/devregression/t/mcs7240_regression_bug1936-isNullisNotNull.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7240_regression_bug1936-isNullisNotNull.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7240_regression_bug1936-isNullisNotNull.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7240_regression_bug1936-isNullisNotNull.test diff --git a/mtr/csinternal/devregression/t/mcs7241_regression_bug1946-stringColToColComparisons.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7241_regression_bug1946-stringColToColComparisons.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7241_regression_bug1946-stringColToColComparisons.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7241_regression_bug1946-stringColToColComparisons.test diff --git a/mtr/csinternal/devregression/t/mcs7242_regression_bug2833.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7242_regression_bug2833.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7242_regression_bug2833.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7242_regression_bug2833.test diff --git a/mtr/csinternal/devregression/t/mcs7243_regression_bug2834.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7243_regression_bug2834.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7243_regression_bug2834.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7243_regression_bug2834.test diff --git a/mtr/csinternal/devregression/t/mcs7244_regression_bug2887_negative.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7244_regression_bug2887_negative.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7244_regression_bug2887_negative.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7244_regression_bug2887_negative.test diff --git a/mtr/csinternal/devregression/t/mcs7245_regression_bug2977.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7245_regression_bug2977.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7245_regression_bug2977.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7245_regression_bug2977.test diff --git a/mtr/csinternal/devregression/t/mcs7246_regression_bug3038.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7246_regression_bug3038.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7246_regression_bug3038.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7246_regression_bug3038.test diff --git a/mtr/csinternal/devregression/t/mcs7247_regression_bug3038b.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7247_regression_bug3038b.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7247_regression_bug3038b.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7247_regression_bug3038b.test diff --git a/mtr/csinternal/devregression/t/mcs7248_regression_bug3038c.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7248_regression_bug3038c.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7248_regression_bug3038c.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7248_regression_bug3038c.test diff --git a/mtr/csinternal/devregression/t/mcs7249_regression_bug3791.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7249_regression_bug3791.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7249_regression_bug3791.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7249_regression_bug3791.test diff --git a/mtr/csinternal/devregression/t/mcs7250_regression_bug4594.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7250_regression_bug4594.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7250_regression_bug4594.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7250_regression_bug4594.test diff --git a/mtr/csinternal/devregression/t/mcs7251_regression_bug5315.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7251_regression_bug5315.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7251_regression_bug5315.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7251_regression_bug5315.test diff --git a/mtr/csinternal/devregression/t/mcs7252_regression_MCOL-669.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7252_regression_MCOL-669.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7252_regression_MCOL-669.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7252_regression_MCOL-669.test diff --git a/mtr/csinternal/devregression/t/mcs7253_regression_MCOL-670.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7253_regression_MCOL-670.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7253_regression_MCOL-670.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7253_regression_MCOL-670.test diff --git a/mtr/csinternal/devregression/t/mcs7254_regression_MCOL-671.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7254_regression_MCOL-671.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7254_regression_MCOL-671.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7254_regression_MCOL-671.test diff --git a/mtr/csinternal/devregression/t/mcs7255_regression_MCOL-673.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7255_regression_MCOL-673.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7255_regression_MCOL-673.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7255_regression_MCOL-673.test diff --git a/mtr/csinternal/devregression/t/mcs7256_regression_mcol-1188.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7256_regression_mcol-1188.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7256_regression_mcol-1188.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7256_regression_mcol-1188.test diff --git a/mtr/csinternal/devregression/t/mcs7257_regression_mcol1642.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7257_regression_mcol1642.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7257_regression_mcol1642.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7257_regression_mcol1642.test diff --git a/mtr/csinternal/devregression/t/mcs7500_qa_fe_cnxFunctions_mathexpr_nl.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7500_qa_fe_cnxFunctions_mathexpr_nl.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7500_qa_fe_cnxFunctions_mathexpr_nl.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7500_qa_fe_cnxFunctions_mathexpr_nl.test diff --git a/mtr/csinternal/devregression/t/mcs7501_qa_fe_cnxExpressions_mathexpr1_nl.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7501_qa_fe_cnxExpressions_mathexpr1_nl.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7501_qa_fe_cnxExpressions_mathexpr1_nl.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7501_qa_fe_cnxExpressions_mathexpr1_nl.test diff --git a/mtr/csinternal/devregression/t/mcs7502_qa_fe_cnxExpressions_mathexpr2_nl.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7502_qa_fe_cnxExpressions_mathexpr2_nl.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7502_qa_fe_cnxExpressions_mathexpr2_nl.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7502_qa_fe_cnxExpressions_mathexpr2_nl.test diff --git a/mtr/csinternal/devregression/t/mcs7504_qa_fe_cnxExpressions_mathexpr4_nm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7504_qa_fe_cnxExpressions_mathexpr4_nm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7504_qa_fe_cnxExpressions_mathexpr4_nm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7504_qa_fe_cnxExpressions_mathexpr4_nm.test diff --git a/mtr/csinternal/devregression/t/mcs7506_qa_fe_cnxExpressions_mathexpr6_nm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7506_qa_fe_cnxExpressions_mathexpr6_nm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7506_qa_fe_cnxExpressions_mathexpr6_nm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7506_qa_fe_cnxExpressions_mathexpr6_nm.test diff --git a/mtr/csinternal/devregression/t/mcs7507_qa_fe_cnxExpressions_mathexpr7_nm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7507_qa_fe_cnxExpressions_mathexpr7_nm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7507_qa_fe_cnxExpressions_mathexpr7_nm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7507_qa_fe_cnxExpressions_mathexpr7_nm.test diff --git a/mtr/csinternal/devregression/t/mcs7509_qa_fe_cnxExpressions_mathexpr9_nm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7509_qa_fe_cnxExpressions_mathexpr9_nm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7509_qa_fe_cnxExpressions_mathexpr9_nm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7509_qa_fe_cnxExpressions_mathexpr9_nm.test diff --git a/mtr/csinternal/devregression/t/mcs7510_qa_fe_cnxExpressions_mathexpr10_nm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7510_qa_fe_cnxExpressions_mathexpr10_nm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7510_qa_fe_cnxExpressions_mathexpr10_nm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7510_qa_fe_cnxExpressions_mathexpr10_nm.test diff --git a/mtr/csinternal/devregression/t/mcs7511_functionsAndExpressions_mathexpr11_nm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7511_functionsAndExpressions_mathexpr11_nm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7511_functionsAndExpressions_mathexpr11_nm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7511_functionsAndExpressions_mathexpr11_nm.test diff --git a/mtr/csinternal/devregression/t/mcs7514_functionsAndExpressions_mathexpr14_nm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7514_functionsAndExpressions_mathexpr14_nm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7514_functionsAndExpressions_mathexpr14_nm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7514_functionsAndExpressions_mathexpr14_nm.test diff --git a/mtr/csinternal/devregression/t/mcs7517_functionsAndExpressions_mathexpr17_nm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7517_functionsAndExpressions_mathexpr17_nm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7517_functionsAndExpressions_mathexpr17_nm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7517_functionsAndExpressions_mathexpr17_nm.test diff --git a/mtr/csinternal/devregression/t/mcs7518_qa_fe_cnxExpressions_mathexpr18_nm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7518_qa_fe_cnxExpressions_mathexpr18_nm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7518_qa_fe_cnxExpressions_mathexpr18_nm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7518_qa_fe_cnxExpressions_mathexpr18_nm.test diff --git a/mtr/csinternal/devregression/t/mcs7519_qa_fe_postProcessedFunctions_mathexpr_nl.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7519_qa_fe_postProcessedFunctions_mathexpr_nl.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7519_qa_fe_postProcessedFunctions_mathexpr_nl.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7519_qa_fe_postProcessedFunctions_mathexpr_nl.test diff --git a/mtr/csinternal/devregression/t/mcs7521_storedProcedures_sp.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7521_storedProcedures_sp.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7521_storedProcedures_sp.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7521_storedProcedures_sp.test diff --git a/mtr/csinternal/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test diff --git a/mtr/csinternal/devregression/t/mcs7523_partitionOptimization_aCreateViews.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7523_partitionOptimization_aCreateViews.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7523_partitionOptimization_aCreateViews.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7523_partitionOptimization_aCreateViews.test diff --git a/mtr/csinternal/devregression/t/mcs7524_view_sp.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7524_view_sp.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7524_view_sp.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7524_view_sp.test diff --git a/mtr/csinternal/devregression/t/mcs7525_MCOL-829.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7525_MCOL-829.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7525_MCOL-829.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7525_MCOL-829.test diff --git a/mtr/csinternal/devregression/t/mcs7526_q2_3_1_1_1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7526_q2_3_1_1_1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7526_q2_3_1_1_1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7526_q2_3_1_1_1.test diff --git a/mtr/csinternal/devregression/t/mcs7527_q2_3_1_1_2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7527_q2_3_1_1_2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7527_q2_3_1_1_2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7527_q2_3_1_1_2.test diff --git a/mtr/csinternal/devregression/t/mcs7528_q2_3_2_1_2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7528_q2_3_2_1_2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7528_q2_3_2_1_2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7528_q2_3_2_1_2.test diff --git a/mtr/csinternal/devregression/t/mcs7529_q2_3_2_1_3.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7529_q2_3_2_1_3.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7529_q2_3_2_1_3.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7529_q2_3_2_1_3.test diff --git a/mtr/csinternal/devregression/t/mcs7530_q2_3_2_1_4.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7530_q2_3_2_1_4.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7530_q2_3_2_1_4.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7530_q2_3_2_1_4.test diff --git a/mtr/csinternal/devregression/t/mcs7531_q2_3_4_1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7531_q2_3_4_1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7531_q2_3_4_1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7531_q2_3_4_1.test diff --git a/mtr/csinternal/devregression/t/mcs7532_q2_3_4_2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7532_q2_3_4_2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7532_q2_3_4_2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7532_q2_3_4_2.test diff --git a/mtr/csinternal/devregression/t/mcs7533_q2_3_4_3.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7533_q2_3_4_3.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7533_q2_3_4_3.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7533_q2_3_4_3.test diff --git a/mtr/csinternal/devregression/t/mcs7534_q2_3_4_4.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7534_q2_3_4_4.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7534_q2_3_4_4.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7534_q2_3_4_4.test diff --git a/mtr/csinternal/devregression/t/mcs7535_q2_3_6.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7535_q2_3_6.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7535_q2_3_6.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7535_q2_3_6.test diff --git a/mtr/csinternal/devregression/t/mcs7536_q4_2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7536_q4_2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7536_q4_2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7536_q4_2.test diff --git a/mtr/csinternal/devregression/t/mcs7537_q4_4.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7537_q4_4.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7537_q4_4.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7537_q4_4.test diff --git a/mtr/csinternal/devregression/t/mcs7538_q4_6_1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7538_q4_6_1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7538_q4_6_1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7538_q4_6_1.test diff --git a/mtr/csinternal/devregression/t/mcs7539_q4_6_2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7539_q4_6_2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7539_q4_6_2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7539_q4_6_2.test diff --git a/mtr/csinternal/devregression/t/mcs7540_q4_6.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7540_q4_6.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7540_q4_6.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7540_q4_6.test diff --git a/mtr/csinternal/devregression/t/mcs7541_q4_8_1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7541_q4_8_1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7541_q4_8_1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7541_q4_8_1.test diff --git a/mtr/csinternal/devregression/t/mcs7542_q4_8_2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7542_q4_8_2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7542_q4_8_2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7542_q4_8_2.test diff --git a/mtr/csinternal/devregression/t/mcs7543_q4_8_3.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7543_q4_8_3.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7543_q4_8_3.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7543_q4_8_3.test diff --git a/mtr/csinternal/devregression/t/mcs7544_q4_8_4.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7544_q4_8_4.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7544_q4_8_4.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7544_q4_8_4.test diff --git a/mtr/csinternal/devregression/t/mcs7545_q4_8_5.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7545_q4_8_5.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7545_q4_8_5.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7545_q4_8_5.test diff --git a/mtr/csinternal/devregression/t/mcs7546_q4_8_6.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7546_q4_8_6.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7546_q4_8_6.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7546_q4_8_6.test diff --git a/mtr/csinternal/devregression/t/mcs7547_q4_8_7.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7547_q4_8_7.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7547_q4_8_7.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7547_q4_8_7.test diff --git a/mtr/csinternal/devregression/t/mcs7548_q4_8_8.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7548_q4_8_8.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7548_q4_8_8.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7548_q4_8_8.test diff --git a/mtr/csinternal/devregression/t/mcs7549_q4_8_9.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7549_q4_8_9.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7549_q4_8_9.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7549_q4_8_9.test diff --git a/mtr/csinternal/devregression/t/mcs7550_q5_1_1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7550_q5_1_1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7550_q5_1_1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7550_q5_1_1.test diff --git a/mtr/csinternal/devregression/t/mcs7551_q5_1_2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7551_q5_1_2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7551_q5_1_2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7551_q5_1_2.test diff --git a/mtr/csinternal/devregression/t/mcs7552_q5_1_3.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7552_q5_1_3.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7552_q5_1_3.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7552_q5_1_3.test diff --git a/mtr/csinternal/devregression/t/mcs7553_q5_2_1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7553_q5_2_1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7553_q5_2_1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7553_q5_2_1.test diff --git a/mtr/csinternal/devregression/t/mcs7554_q5_2_2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7554_q5_2_2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7554_q5_2_2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7554_q5_2_2.test diff --git a/mtr/csinternal/devregression/t/mcs7555_q5_2_3.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7555_q5_2_3.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7555_q5_2_3.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7555_q5_2_3.test diff --git a/mtr/csinternal/devregression/t/mcs7556_q5_2_4.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7556_q5_2_4.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7556_q5_2_4.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7556_q5_2_4.test diff --git a/mtr/csinternal/devregression/t/mcs7557_q5_2_5.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7557_q5_2_5.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7557_q5_2_5.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7557_q5_2_5.test diff --git a/mtr/csinternal/devregression/t/mcs7558_q5_3_1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7558_q5_3_1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7558_q5_3_1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7558_q5_3_1.test diff --git a/mtr/csinternal/devregression/t/mcs7559_q5_4_1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7559_q5_4_1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7559_q5_4_1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7559_q5_4_1.test diff --git a/mtr/csinternal/devregression/t/mcs7560_q5_4_2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7560_q5_4_2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7560_q5_4_2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7560_q5_4_2.test diff --git a/mtr/csinternal/devregression/t/mcs7561_q5_4_3.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7561_q5_4_3.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7561_q5_4_3.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7561_q5_4_3.test diff --git a/mtr/csinternal/devregression/t/mcs7562_aggregate_tpch_lineitem.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7562_aggregate_tpch_lineitem.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7562_aggregate_tpch_lineitem.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7562_aggregate_tpch_lineitem.test diff --git a/mtr/csinternal/devregression/t/mcs7563_aggregate_tpch_orders.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7563_aggregate_tpch_orders.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7563_aggregate_tpch_orders.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7563_aggregate_tpch_orders.test diff --git a/mtr/csinternal/devregression/t/mcs7564_aggregate_tpch_others.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7564_aggregate_tpch_others.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7564_aggregate_tpch_others.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7564_aggregate_tpch_others.test diff --git a/mtr/csinternal/devregression/t/mcs7565_dataval_001.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7565_dataval_001.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7565_dataval_001.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7565_dataval_001.test diff --git a/mtr/csinternal/devregression/t/mcs7566_dataval_002.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7566_dataval_002.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7566_dataval_002.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7566_dataval_002.test diff --git a/mtr/csinternal/devregression/t/mcs7567_dataval_003.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7567_dataval_003.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7567_dataval_003.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7567_dataval_003.test diff --git a/mtr/csinternal/devregression/t/mcs7568_dataval_004.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7568_dataval_004.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7568_dataval_004.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7568_dataval_004.test diff --git a/mtr/csinternal/devregression/t/mcs7569_dataval_005.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7569_dataval_005.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7569_dataval_005.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7569_dataval_005.test diff --git a/mtr/csinternal/devregression/t/mcs7570_str_aggregate_tpch_lineitem.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7570_str_aggregate_tpch_lineitem.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7570_str_aggregate_tpch_lineitem.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7570_str_aggregate_tpch_lineitem.test diff --git a/mtr/csinternal/devregression/t/mcs7571_tpchValidation.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7571_tpchValidation.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7571_tpchValidation.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7571_tpchValidation.test diff --git a/mtr/csinternal/devregression/t/mcs7572_ssbValidation.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7572_ssbValidation.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7572_ssbValidation.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7572_ssbValidation.test diff --git a/mtr/csinternal/devregression/t/mcs7573_datatypetestm.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7573_datatypetestm.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7573_datatypetestm.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7573_datatypetestm.test diff --git a/mtr/csinternal/devregression/t/mcs7574_datatypetestm1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7574_datatypetestm1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7574_datatypetestm1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7574_datatypetestm1.test diff --git a/mtr/csinternal/devregression/t/mcs7575_datatypetestm2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7575_datatypetestm2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7575_datatypetestm2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7575_datatypetestm2.test diff --git a/mtr/csinternal/devregression/t/mcs7577_dtypes.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7577_dtypes.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7577_dtypes.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7577_dtypes.test diff --git a/mtr/csinternal/devregression/t/mcs7578_j1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7578_j1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7578_j1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7578_j1.test diff --git a/mtr/csinternal/devregression/t/mcs7579_j11.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7579_j11.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7579_j11.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7579_j11.test diff --git a/mtr/csinternal/devregression/t/mcs7580_j16.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7580_j16.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7580_j16.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7580_j16.test diff --git a/mtr/csinternal/devregression/t/mcs7581_j6.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7581_j6.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7581_j6.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7581_j6.test diff --git a/mtr/csinternal/devregression/t/mcs7582_sub1.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7582_sub1.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7582_sub1.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7582_sub1.test diff --git a/mtr/csinternal/devregression/t/mcs7583_sub2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7583_sub2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7583_sub2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7583_sub2.test diff --git a/mtr/csinternal/devregression/t/mcs7584_sub3.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7584_sub3.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7584_sub3.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7584_sub3.test diff --git a/mtr/csinternal/devregression/t/mcs7585_sub4.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7585_sub4.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7585_sub4.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7585_sub4.test diff --git a/mtr/csinternal/devregression/t/mcs7586_sub5.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7586_sub5.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7586_sub5.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7586_sub5.test diff --git a/mtr/csinternal/devregression/t/mcs7591_tpchValidation.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7591_tpchValidation.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7591_tpchValidation.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7591_tpchValidation.test diff --git a/mtr/csinternal/devregression/t/mcs7592_wide.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7592_wide.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7592_wide.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7592_wide.test diff --git a/mtr/csinternal/devregression/t/mcs7593_q23111.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7593_q23111.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7593_q23111.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7593_q23111.test diff --git a/mtr/csinternal/devregression/t/mcs7594_q23112.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7594_q23112.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7594_q23112.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7594_q23112.test diff --git a/mtr/csinternal/devregression/t/mcs7595_q23211.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7595_q23211.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7595_q23211.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7595_q23211.test diff --git a/mtr/csinternal/devregression/t/mcs7596_q23212.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7596_q23212.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7596_q23212.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7596_q23212.test diff --git a/mtr/csinternal/devregression/t/mcs7597_q23213.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7597_q23213.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7597_q23213.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7597_q23213.test diff --git a/mtr/csinternal/devregression/t/mcs7598_q23214.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7598_q23214.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7598_q23214.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7598_q23214.test diff --git a/mtr/csinternal/devregression/t/mcs7599_q2341.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7599_q2341.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7599_q2341.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7599_q2341.test diff --git a/mtr/csinternal/devregression/t/mcs7600_q2342.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7600_q2342.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7600_q2342.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7600_q2342.test diff --git a/mtr/csinternal/devregression/t/mcs7601_q2343.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7601_q2343.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7601_q2343.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7601_q2343.test diff --git a/mtr/csinternal/devregression/t/mcs7602_q2344.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7602_q2344.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7602_q2344.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7602_q2344.test diff --git a/mtr/csinternal/devregression/t/mcs7603_q236.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7603_q236.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7603_q236.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7603_q236.test diff --git a/mtr/csinternal/devregression/t/mcs7604_q42.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7604_q42.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7604_q42.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7604_q42.test diff --git a/mtr/csinternal/devregression/t/mcs7605_q43.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7605_q43.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7605_q43.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7605_q43.test diff --git a/mtr/csinternal/devregression/t/mcs7606_q44.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7606_q44.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7606_q44.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7606_q44.test diff --git a/mtr/csinternal/devregression/t/mcs7607_q461.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7607_q461.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7607_q461.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7607_q461.test diff --git a/mtr/csinternal/devregression/t/mcs7608_q462.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7608_q462.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7608_q462.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7608_q462.test diff --git a/mtr/csinternal/devregression/t/mcs7609_q46.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7609_q46.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7609_q46.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7609_q46.test diff --git a/mtr/csinternal/devregression/t/mcs7610_q481.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7610_q481.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7610_q481.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7610_q481.test diff --git a/mtr/csinternal/devregression/t/mcs7611_q482.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7611_q482.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7611_q482.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7611_q482.test diff --git a/mtr/csinternal/devregression/t/mcs7612_q483.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7612_q483.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7612_q483.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7612_q483.test diff --git a/mtr/csinternal/devregression/t/mcs7613_q484.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7613_q484.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7613_q484.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7613_q484.test diff --git a/mtr/csinternal/devregression/t/mcs7614_q485.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7614_q485.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7614_q485.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7614_q485.test diff --git a/mtr/csinternal/devregression/t/mcs7615_q486.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7615_q486.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7615_q486.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7615_q486.test diff --git a/mtr/csinternal/devregression/t/mcs7616_q487.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7616_q487.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7616_q487.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7616_q487.test diff --git a/mtr/csinternal/devregression/t/mcs7617_q488.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7617_q488.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7617_q488.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7617_q488.test diff --git a/mtr/csinternal/devregression/t/mcs7618_q489.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7618_q489.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7618_q489.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7618_q489.test diff --git a/mtr/csinternal/devregression/t/mcs7619_q511.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7619_q511.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7619_q511.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7619_q511.test diff --git a/mtr/csinternal/devregression/t/mcs7620_q512.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7620_q512.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7620_q512.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7620_q512.test diff --git a/mtr/csinternal/devregression/t/mcs7621_q513.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7621_q513.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7621_q513.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7621_q513.test diff --git a/mtr/csinternal/devregression/t/mcs7622_q521.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7622_q521.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7622_q521.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7622_q521.test diff --git a/mtr/csinternal/devregression/t/mcs7623_q522.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7623_q522.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7623_q522.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7623_q522.test diff --git a/mtr/csinternal/devregression/t/mcs7624_q523.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7624_q523.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7624_q523.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7624_q523.test diff --git a/mtr/csinternal/devregression/t/mcs7625_q524.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7625_q524.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7625_q524.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7625_q524.test diff --git a/mtr/csinternal/devregression/t/mcs7626_q525.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7626_q525.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7626_q525.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7626_q525.test diff --git a/mtr/csinternal/devregression/t/mcs7627_q531.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7627_q531.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7627_q531.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7627_q531.test diff --git a/mtr/csinternal/devregression/t/mcs7628_q541.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7628_q541.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7628_q541.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7628_q541.test diff --git a/mtr/csinternal/devregression/t/mcs7629_q542.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7629_q542.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7629_q542.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7629_q542.test diff --git a/mtr/csinternal/devregression/t/mcs7630_q543.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7630_q543.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7630_q543.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7630_q543.test diff --git a/mtr/csinternal/devregression/t/mcs7631_q111.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7631_q111.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7631_q111.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7631_q111.test diff --git a/mtr/csinternal/devregression/t/mcs7632_q112.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7632_q112.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7632_q112.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7632_q112.test diff --git a/mtr/csinternal/devregression/t/mcs7633_q113.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7633_q113.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7633_q113.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7633_q113.test diff --git a/mtr/csinternal/devregression/t/mcs7634_q211.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7634_q211.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7634_q211.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7634_q211.test diff --git a/mtr/csinternal/devregression/t/mcs7635_q212.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7635_q212.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7635_q212.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7635_q212.test diff --git a/mtr/csinternal/devregression/t/mcs7636_q213.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7636_q213.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7636_q213.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7636_q213.test diff --git a/mtr/csinternal/devregression/t/mcs7637_q214.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7637_q214.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7637_q214.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7637_q214.test diff --git a/mtr/csinternal/devregression/t/mcs7640_q23111.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7640_q23111.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7640_q23111.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7640_q23111.test diff --git a/mtr/csinternal/devregression/t/mcs7641_q23112.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7641_q23112.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7641_q23112.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7641_q23112.test diff --git a/mtr/csinternal/devregression/t/mcs7642_q23211.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7642_q23211.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7642_q23211.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7642_q23211.test diff --git a/mtr/csinternal/devregression/t/mcs7643_q23212.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7643_q23212.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7643_q23212.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7643_q23212.test diff --git a/mtr/csinternal/devregression/t/mcs7644_q23213.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7644_q23213.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7644_q23213.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7644_q23213.test diff --git a/mtr/csinternal/devregression/t/mcs7645_q23214.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7645_q23214.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7645_q23214.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7645_q23214.test diff --git a/mtr/csinternal/devregression/t/mcs7646_q2341.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7646_q2341.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7646_q2341.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7646_q2341.test diff --git a/mtr/csinternal/devregression/t/mcs7647_q2342.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7647_q2342.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7647_q2342.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7647_q2342.test diff --git a/mtr/csinternal/devregression/t/mcs7648_q2343.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7648_q2343.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7648_q2343.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7648_q2343.test diff --git a/mtr/csinternal/devregression/t/mcs7649_q2344.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7649_q2344.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7649_q2344.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7649_q2344.test diff --git a/mtr/csinternal/devregression/t/mcs7650_q236.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7650_q236.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7650_q236.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7650_q236.test diff --git a/mtr/csinternal/devregression/t/mcs7651_q42.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7651_q42.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7651_q42.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7651_q42.test diff --git a/mtr/csinternal/devregression/t/mcs7652_q43.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7652_q43.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7652_q43.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7652_q43.test diff --git a/mtr/csinternal/devregression/t/mcs7653_q44.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7653_q44.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7653_q44.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7653_q44.test diff --git a/mtr/csinternal/devregression/t/mcs7654_q461.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7654_q461.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7654_q461.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7654_q461.test diff --git a/mtr/csinternal/devregression/t/mcs7655_q462.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7655_q462.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7655_q462.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7655_q462.test diff --git a/mtr/csinternal/devregression/t/mcs7656_q46.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7656_q46.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7656_q46.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7656_q46.test diff --git a/mtr/csinternal/devregression/t/mcs7657_q481.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7657_q481.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7657_q481.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7657_q481.test diff --git a/mtr/csinternal/devregression/t/mcs7658_q482.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7658_q482.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7658_q482.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7658_q482.test diff --git a/mtr/csinternal/devregression/t/mcs7659_q483.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7659_q483.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7659_q483.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7659_q483.test diff --git a/mtr/csinternal/devregression/t/mcs7660_q484.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7660_q484.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7660_q484.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7660_q484.test diff --git a/mtr/csinternal/devregression/t/mcs7661_q485.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7661_q485.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7661_q485.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7661_q485.test diff --git a/mtr/csinternal/devregression/t/mcs7662_q486.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7662_q486.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7662_q486.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7662_q486.test diff --git a/mtr/csinternal/devregression/t/mcs7663_q487.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7663_q487.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7663_q487.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7663_q487.test diff --git a/mtr/csinternal/devregression/t/mcs7664_q488.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7664_q488.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7664_q488.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7664_q488.test diff --git a/mtr/csinternal/devregression/t/mcs7665_q489.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7665_q489.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7665_q489.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7665_q489.test diff --git a/mtr/csinternal/devregression/t/mcs7666_q511.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7666_q511.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7666_q511.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7666_q511.test diff --git a/mtr/csinternal/devregression/t/mcs7667_q512.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7667_q512.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7667_q512.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7667_q512.test diff --git a/mtr/csinternal/devregression/t/mcs7668_q513.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7668_q513.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7668_q513.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7668_q513.test diff --git a/mtr/csinternal/devregression/t/mcs7669_q521.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7669_q521.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7669_q521.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7669_q521.test diff --git a/mtr/csinternal/devregression/t/mcs7670_q522.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7670_q522.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7670_q522.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7670_q522.test diff --git a/mtr/csinternal/devregression/t/mcs7671_q523.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7671_q523.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7671_q523.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7671_q523.test diff --git a/mtr/csinternal/devregression/t/mcs7672_q524.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7672_q524.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7672_q524.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7672_q524.test diff --git a/mtr/csinternal/devregression/t/mcs7673_q525.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7673_q525.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7673_q525.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7673_q525.test diff --git a/mtr/csinternal/devregression/t/mcs7674_q531.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7674_q531.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7674_q531.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7674_q531.test diff --git a/mtr/csinternal/devregression/t/mcs7675_q541.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7675_q541.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7675_q541.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7675_q541.test diff --git a/mtr/csinternal/devregression/t/mcs7676_q542.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7676_q542.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7676_q542.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7676_q542.test diff --git a/mtr/csinternal/devregression/t/mcs7677_q543.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7677_q543.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7677_q543.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7677_q543.test diff --git a/mtr/csinternal/devregression/t/mcs7678_ssb_dim01.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7678_ssb_dim01.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7678_ssb_dim01.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7678_ssb_dim01.test diff --git a/mtr/csinternal/devregression/t/mcs7679_ssb_dim02.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7679_ssb_dim02.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7679_ssb_dim02.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7679_ssb_dim02.test diff --git a/mtr/csinternal/devregression/t/mcs7680_ssb_dim03.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7680_ssb_dim03.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7680_ssb_dim03.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7680_ssb_dim03.test diff --git a/mtr/csinternal/devregression/t/mcs7681_ssb_dim04.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7681_ssb_dim04.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7681_ssb_dim04.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7681_ssb_dim04.test diff --git a/mtr/csinternal/devregression/t/mcs7682_ssb_dim05.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7682_ssb_dim05.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7682_ssb_dim05.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7682_ssb_dim05.test diff --git a/mtr/csinternal/devregression/t/mcs7683_ssb_dim06.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7683_ssb_dim06.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7683_ssb_dim06.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7683_ssb_dim06.test diff --git a/mtr/csinternal/devregression/t/mcs7684_ssb_dim07.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7684_ssb_dim07.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7684_ssb_dim07.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7684_ssb_dim07.test diff --git a/mtr/csinternal/devregression/t/mcs7685_ssb_dim08.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7685_ssb_dim08.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7685_ssb_dim08.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7685_ssb_dim08.test diff --git a/mtr/csinternal/devregression/t/mcs7686_ssb_dim09.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7686_ssb_dim09.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7686_ssb_dim09.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7686_ssb_dim09.test diff --git a/mtr/csinternal/devregression/t/mcs7687_ssb_dim10.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7687_ssb_dim10.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7687_ssb_dim10.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7687_ssb_dim10.test diff --git a/mtr/csinternal/devregression/t/mcs7688_ssb_dim11.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7688_ssb_dim11.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7688_ssb_dim11.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7688_ssb_dim11.test diff --git a/mtr/csinternal/devregression/t/mcs7689_ssb_dim12.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7689_ssb_dim12.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7689_ssb_dim12.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7689_ssb_dim12.test diff --git a/mtr/csinternal/devregression/t/mcs7690_ssb_dim_2colgrp02.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7690_ssb_dim_2colgrp02.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7690_ssb_dim_2colgrp02.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7690_ssb_dim_2colgrp02.test diff --git a/mtr/csinternal/devregression/t/mcs7691_ssb_dim_2colgrp03.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7691_ssb_dim_2colgrp03.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7691_ssb_dim_2colgrp03.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7691_ssb_dim_2colgrp03.test diff --git a/mtr/csinternal/devregression/t/mcs7692_ssb_dim_2colgrp04.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7692_ssb_dim_2colgrp04.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7692_ssb_dim_2colgrp04.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7692_ssb_dim_2colgrp04.test diff --git a/mtr/csinternal/devregression/t/mcs7693_ssb_dim_2colgrp05.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7693_ssb_dim_2colgrp05.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7693_ssb_dim_2colgrp05.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7693_ssb_dim_2colgrp05.test diff --git a/mtr/csinternal/devregression/t/mcs7694_ssb_dim_2colgrp06.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7694_ssb_dim_2colgrp06.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7694_ssb_dim_2colgrp06.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7694_ssb_dim_2colgrp06.test diff --git a/mtr/csinternal/devregression/t/mcs7695_ssb_dim_2colgrp07.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7695_ssb_dim_2colgrp07.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7695_ssb_dim_2colgrp07.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7695_ssb_dim_2colgrp07.test diff --git a/mtr/csinternal/devregression/t/mcs7696_ssb_dim_2colgrp08.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7696_ssb_dim_2colgrp08.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7696_ssb_dim_2colgrp08.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7696_ssb_dim_2colgrp08.test diff --git a/mtr/csinternal/devregression/t/mcs7697_ssb_dim_2colgrp09.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7697_ssb_dim_2colgrp09.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7697_ssb_dim_2colgrp09.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7697_ssb_dim_2colgrp09.test diff --git a/mtr/csinternal/devregression/t/mcs7698_ssb_dim_2colgrp10.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7698_ssb_dim_2colgrp10.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7698_ssb_dim_2colgrp10.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7698_ssb_dim_2colgrp10.test diff --git a/mtr/csinternal/devregression/t/mcs7699_ssb_dim_2colgrp11.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7699_ssb_dim_2colgrp11.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7699_ssb_dim_2colgrp11.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7699_ssb_dim_2colgrp11.test diff --git a/mtr/csinternal/devregression/t/mcs7700_ssb_dim_2colgrp12.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7700_ssb_dim_2colgrp12.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7700_ssb_dim_2colgrp12.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7700_ssb_dim_2colgrp12.test diff --git a/mtr/csinternal/devregression/t/mcs7701_q11mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7701_q11mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7701_q11mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7701_q11mod.test diff --git a/mtr/csinternal/devregression/t/mcs7702_q12mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7702_q12mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7702_q12mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7702_q12mod.test diff --git a/mtr/csinternal/devregression/t/mcs7703_q13mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7703_q13mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7703_q13mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7703_q13mod.test diff --git a/mtr/csinternal/devregression/t/mcs7704_q21mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7704_q21mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7704_q21mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7704_q21mod.test diff --git a/mtr/csinternal/devregression/t/mcs7705_q22mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7705_q22mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7705_q22mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7705_q22mod.test diff --git a/mtr/csinternal/devregression/t/mcs7706_q23mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7706_q23mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7706_q23mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7706_q23mod.test diff --git a/mtr/csinternal/devregression/t/mcs7707_q31mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7707_q31mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7707_q31mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7707_q31mod.test diff --git a/mtr/csinternal/devregression/t/mcs7708_q32mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7708_q32mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7708_q32mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7708_q32mod.test diff --git a/mtr/csinternal/devregression/t/mcs7709_q33mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7709_q33mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7709_q33mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7709_q33mod.test diff --git a/mtr/csinternal/devregression/t/mcs7710_q34mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7710_q34mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7710_q34mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7710_q34mod.test diff --git a/mtr/csinternal/devregression/t/mcs7711_q41mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7711_q41mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7711_q41mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7711_q41mod.test diff --git a/mtr/csinternal/devregression/t/mcs7712_q42mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7712_q42mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7712_q42mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7712_q42mod.test diff --git a/mtr/csinternal/devregression/t/mcs7713_q43mod.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7713_q43mod.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7713_q43mod.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7713_q43mod.test diff --git a/mtr/csinternal/devregression/t/mcs7714_ssb_dim_mixed_outer_2colgrp9.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7714_ssb_dim_mixed_outer_2colgrp9.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7714_ssb_dim_mixed_outer_2colgrp9.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7714_ssb_dim_mixed_outer_2colgrp9.test diff --git a/mtr/csinternal/devregression/t/mcs7715_ssb_dim_mixed_outer_2colgrp8.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7715_ssb_dim_mixed_outer_2colgrp8.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7715_ssb_dim_mixed_outer_2colgrp8.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7715_ssb_dim_mixed_outer_2colgrp8.test diff --git a/mtr/csinternal/devregression/t/mcs7716_ssb_dim_mixed_outer_2colgrp7.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7716_ssb_dim_mixed_outer_2colgrp7.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7716_ssb_dim_mixed_outer_2colgrp7.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7716_ssb_dim_mixed_outer_2colgrp7.test diff --git a/mtr/csinternal/devregression/t/mcs7717_ssb_dim_mixed_outer_2colgrp6.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7717_ssb_dim_mixed_outer_2colgrp6.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7717_ssb_dim_mixed_outer_2colgrp6.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7717_ssb_dim_mixed_outer_2colgrp6.test diff --git a/mtr/csinternal/devregression/t/mcs7718_ssb_dim_mixed_outer_2colgrp5.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7718_ssb_dim_mixed_outer_2colgrp5.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7718_ssb_dim_mixed_outer_2colgrp5.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7718_ssb_dim_mixed_outer_2colgrp5.test diff --git a/mtr/csinternal/devregression/t/mcs7719_ssb_dim_mixed_outer_2colgrp4.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7719_ssb_dim_mixed_outer_2colgrp4.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7719_ssb_dim_mixed_outer_2colgrp4.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7719_ssb_dim_mixed_outer_2colgrp4.test diff --git a/mtr/csinternal/devregression/t/mcs7720_ssb_dim_mixed_outer_2colgrp3.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7720_ssb_dim_mixed_outer_2colgrp3.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7720_ssb_dim_mixed_outer_2colgrp3.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7720_ssb_dim_mixed_outer_2colgrp3.test diff --git a/mtr/csinternal/devregression/t/mcs7721_ssb_dim_mixed_outer_2colgrp2.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7721_ssb_dim_mixed_outer_2colgrp2.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7721_ssb_dim_mixed_outer_2colgrp2.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7721_ssb_dim_mixed_outer_2colgrp2.test diff --git a/mtr/csinternal/devregression/t/mcs7722_ssb_dim_mixed_outer_2colgrp12.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7722_ssb_dim_mixed_outer_2colgrp12.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7722_ssb_dim_mixed_outer_2colgrp12.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7722_ssb_dim_mixed_outer_2colgrp12.test diff --git a/mtr/csinternal/devregression/t/mcs7723_ssb_dim_mixed_outer_2colgrp11.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7723_ssb_dim_mixed_outer_2colgrp11.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7723_ssb_dim_mixed_outer_2colgrp11.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7723_ssb_dim_mixed_outer_2colgrp11.test diff --git a/mtr/csinternal/devregression/t/mcs7724_ssb_dim_mixed_outer_2colgrp10.test b/mysql-test/columnstore/csinternal/devregression/t/mcs7724_ssb_dim_mixed_outer_2colgrp10.test similarity index 100% rename from mtr/csinternal/devregression/t/mcs7724_ssb_dim_mixed_outer_2colgrp10.test rename to mysql-test/columnstore/csinternal/devregression/t/mcs7724_ssb_dim_mixed_outer_2colgrp10.test diff --git a/mtr/csinternal/include/alter_table_add_columns.inc b/mysql-test/columnstore/csinternal/include/alter_table_add_columns.inc similarity index 100% rename from mtr/csinternal/include/alter_table_add_columns.inc rename to mysql-test/columnstore/csinternal/include/alter_table_add_columns.inc diff --git a/mtr/csinternal/include/alter_table_drop_columns.inc b/mysql-test/columnstore/csinternal/include/alter_table_drop_columns.inc similarity index 100% rename from mtr/csinternal/include/alter_table_drop_columns.inc rename to mysql-test/columnstore/csinternal/include/alter_table_drop_columns.inc diff --git a/mtr/csinternal/include/autopilot_create_datatypetestm_tables.inc b/mysql-test/columnstore/csinternal/include/autopilot_create_datatypetestm_tables.inc similarity index 100% rename from mtr/csinternal/include/autopilot_create_datatypetestm_tables.inc rename to mysql-test/columnstore/csinternal/include/autopilot_create_datatypetestm_tables.inc diff --git a/mtr/csinternal/include/autopilot_create_datatypeupdate_table.inc b/mysql-test/columnstore/csinternal/include/autopilot_create_datatypeupdate_table.inc similarity index 100% rename from mtr/csinternal/include/autopilot_create_datatypeupdate_table.inc rename to mysql-test/columnstore/csinternal/include/autopilot_create_datatypeupdate_table.inc diff --git a/mtr/csinternal/include/autopilot_create_jsontest_table.inc b/mysql-test/columnstore/csinternal/include/autopilot_create_jsontest_table.inc similarity index 100% rename from mtr/csinternal/include/autopilot_create_jsontest_table.inc rename to mysql-test/columnstore/csinternal/include/autopilot_create_jsontest_table.inc diff --git a/mtr/csinternal/include/autopilot_create_outerjoin_tables.inc b/mysql-test/columnstore/csinternal/include/autopilot_create_outerjoin_tables.inc similarity index 100% rename from mtr/csinternal/include/autopilot_create_outerjoin_tables.inc rename to mysql-test/columnstore/csinternal/include/autopilot_create_outerjoin_tables.inc diff --git a/mtr/csinternal/include/dbt3/countCustomer.inc b/mysql-test/columnstore/csinternal/include/dbt3/countCustomer.inc similarity index 100% rename from mtr/csinternal/include/dbt3/countCustomer.inc rename to mysql-test/columnstore/csinternal/include/dbt3/countCustomer.inc diff --git a/mtr/csinternal/include/dbt3/countLineitem.inc b/mysql-test/columnstore/csinternal/include/dbt3/countLineitem.inc similarity index 100% rename from mtr/csinternal/include/dbt3/countLineitem.inc rename to mysql-test/columnstore/csinternal/include/dbt3/countLineitem.inc diff --git a/mtr/csinternal/include/dbt3/countNation.inc b/mysql-test/columnstore/csinternal/include/dbt3/countNation.inc similarity index 100% rename from mtr/csinternal/include/dbt3/countNation.inc rename to mysql-test/columnstore/csinternal/include/dbt3/countNation.inc diff --git a/mtr/csinternal/include/dbt3/countOrders.inc b/mysql-test/columnstore/csinternal/include/dbt3/countOrders.inc similarity index 100% rename from mtr/csinternal/include/dbt3/countOrders.inc rename to mysql-test/columnstore/csinternal/include/dbt3/countOrders.inc diff --git a/mtr/csinternal/include/dbt3/countPart.inc b/mysql-test/columnstore/csinternal/include/dbt3/countPart.inc similarity index 100% rename from mtr/csinternal/include/dbt3/countPart.inc rename to mysql-test/columnstore/csinternal/include/dbt3/countPart.inc diff --git a/mtr/csinternal/include/dbt3/countPartsupp.inc b/mysql-test/columnstore/csinternal/include/dbt3/countPartsupp.inc similarity index 100% rename from mtr/csinternal/include/dbt3/countPartsupp.inc rename to mysql-test/columnstore/csinternal/include/dbt3/countPartsupp.inc diff --git a/mtr/csinternal/include/dbt3/countRegion.inc b/mysql-test/columnstore/csinternal/include/dbt3/countRegion.inc similarity index 100% rename from mtr/csinternal/include/dbt3/countRegion.inc rename to mysql-test/columnstore/csinternal/include/dbt3/countRegion.inc diff --git a/mtr/csinternal/include/dbt3/countSupplier.inc b/mysql-test/columnstore/csinternal/include/dbt3/countSupplier.inc similarity index 100% rename from mtr/csinternal/include/dbt3/countSupplier.inc rename to mysql-test/columnstore/csinternal/include/dbt3/countSupplier.inc diff --git a/mtr/csinternal/include/dbt3/countTables.inc b/mysql-test/columnstore/csinternal/include/dbt3/countTables.inc similarity index 100% rename from mtr/csinternal/include/dbt3/countTables.inc rename to mysql-test/columnstore/csinternal/include/dbt3/countTables.inc diff --git a/mtr/csinternal/include/dbt3/createCustomer.inc b/mysql-test/columnstore/csinternal/include/dbt3/createCustomer.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createCustomer.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createCustomer.inc diff --git a/mtr/csinternal/include/dbt3/createLineitem.inc b/mysql-test/columnstore/csinternal/include/dbt3/createLineitem.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createLineitem.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createLineitem.inc diff --git a/mtr/csinternal/include/dbt3/createLineitem1.inc b/mysql-test/columnstore/csinternal/include/dbt3/createLineitem1.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createLineitem1.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createLineitem1.inc diff --git a/mtr/csinternal/include/dbt3/createNation.inc b/mysql-test/columnstore/csinternal/include/dbt3/createNation.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createNation.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createNation.inc diff --git a/mtr/csinternal/include/dbt3/createOrders.inc b/mysql-test/columnstore/csinternal/include/dbt3/createOrders.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createOrders.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createOrders.inc diff --git a/mtr/csinternal/include/dbt3/createPart.inc b/mysql-test/columnstore/csinternal/include/dbt3/createPart.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createPart.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createPart.inc diff --git a/mtr/csinternal/include/dbt3/createPartsupp.inc b/mysql-test/columnstore/csinternal/include/dbt3/createPartsupp.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createPartsupp.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createPartsupp.inc diff --git a/mtr/csinternal/include/dbt3/createRegion.inc b/mysql-test/columnstore/csinternal/include/dbt3/createRegion.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createRegion.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createRegion.inc diff --git a/mtr/csinternal/include/dbt3/createSupplier.inc b/mysql-test/columnstore/csinternal/include/dbt3/createSupplier.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createSupplier.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createSupplier.inc diff --git a/mtr/csinternal/include/dbt3/createTables.inc b/mysql-test/columnstore/csinternal/include/dbt3/createTables.inc similarity index 100% rename from mtr/csinternal/include/dbt3/createTables.inc rename to mysql-test/columnstore/csinternal/include/dbt3/createTables.inc diff --git a/mtr/csinternal/include/dbt3/dbt3_performance_queries_1g.sql b/mysql-test/columnstore/csinternal/include/dbt3/dbt3_performance_queries_1g.sql similarity index 100% rename from mtr/csinternal/include/dbt3/dbt3_performance_queries_1g.sql rename to mysql-test/columnstore/csinternal/include/dbt3/dbt3_performance_queries_1g.sql diff --git a/mtr/csinternal/include/dbt3/dbt3_performance_queries_1m.sql b/mysql-test/columnstore/csinternal/include/dbt3/dbt3_performance_queries_1m.sql similarity index 100% rename from mtr/csinternal/include/dbt3/dbt3_performance_queries_1m.sql rename to mysql-test/columnstore/csinternal/include/dbt3/dbt3_performance_queries_1m.sql diff --git a/mtr/csinternal/include/dbt3/dropCustomer.inc b/mysql-test/columnstore/csinternal/include/dbt3/dropCustomer.inc similarity index 100% rename from mtr/csinternal/include/dbt3/dropCustomer.inc rename to mysql-test/columnstore/csinternal/include/dbt3/dropCustomer.inc diff --git a/mtr/csinternal/include/dbt3/dropLineitem.inc b/mysql-test/columnstore/csinternal/include/dbt3/dropLineitem.inc similarity index 100% rename from mtr/csinternal/include/dbt3/dropLineitem.inc rename to mysql-test/columnstore/csinternal/include/dbt3/dropLineitem.inc diff --git a/mtr/csinternal/include/dbt3/dropNation.inc b/mysql-test/columnstore/csinternal/include/dbt3/dropNation.inc similarity index 100% rename from mtr/csinternal/include/dbt3/dropNation.inc rename to mysql-test/columnstore/csinternal/include/dbt3/dropNation.inc diff --git a/mtr/csinternal/include/dbt3/dropOrders.inc b/mysql-test/columnstore/csinternal/include/dbt3/dropOrders.inc similarity index 100% rename from mtr/csinternal/include/dbt3/dropOrders.inc rename to mysql-test/columnstore/csinternal/include/dbt3/dropOrders.inc diff --git a/mtr/csinternal/include/dbt3/dropPart.inc b/mysql-test/columnstore/csinternal/include/dbt3/dropPart.inc similarity index 100% rename from mtr/csinternal/include/dbt3/dropPart.inc rename to mysql-test/columnstore/csinternal/include/dbt3/dropPart.inc diff --git a/mtr/csinternal/include/dbt3/dropPartsupp.inc b/mysql-test/columnstore/csinternal/include/dbt3/dropPartsupp.inc similarity index 100% rename from mtr/csinternal/include/dbt3/dropPartsupp.inc rename to mysql-test/columnstore/csinternal/include/dbt3/dropPartsupp.inc diff --git a/mtr/csinternal/include/dbt3/dropRegion.inc b/mysql-test/columnstore/csinternal/include/dbt3/dropRegion.inc similarity index 100% rename from mtr/csinternal/include/dbt3/dropRegion.inc rename to mysql-test/columnstore/csinternal/include/dbt3/dropRegion.inc diff --git a/mtr/csinternal/include/dbt3/dropSupplier.inc b/mysql-test/columnstore/csinternal/include/dbt3/dropSupplier.inc similarity index 100% rename from mtr/csinternal/include/dbt3/dropSupplier.inc rename to mysql-test/columnstore/csinternal/include/dbt3/dropSupplier.inc diff --git a/mtr/csinternal/include/dbt3/dropTables.inc b/mysql-test/columnstore/csinternal/include/dbt3/dropTables.inc similarity index 100% rename from mtr/csinternal/include/dbt3/dropTables.inc rename to mysql-test/columnstore/csinternal/include/dbt3/dropTables.inc diff --git a/mtr/csinternal/include/dbt3/ldiCustomer1g.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiCustomer1g.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiCustomer1g.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiCustomer1g.inc diff --git a/mtr/csinternal/include/dbt3/ldiCustomer1m.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiCustomer1m.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiCustomer1m.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiCustomer1m.inc diff --git a/mtr/csinternal/include/dbt3/ldiLineitem1g.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiLineitem1g.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiLineitem1g.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiLineitem1g.inc diff --git a/mtr/csinternal/include/dbt3/ldiLineitem1m.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiLineitem1m.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiLineitem1m.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiLineitem1m.inc diff --git a/mtr/csinternal/include/dbt3/ldiNation1g.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiNation1g.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiNation1g.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiNation1g.inc diff --git a/mtr/csinternal/include/dbt3/ldiNation1m.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiNation1m.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiNation1m.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiNation1m.inc diff --git a/mtr/csinternal/include/dbt3/ldiOrders1g.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiOrders1g.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiOrders1g.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiOrders1g.inc diff --git a/mtr/csinternal/include/dbt3/ldiOrders1m.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiOrders1m.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiOrders1m.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiOrders1m.inc diff --git a/mtr/csinternal/include/dbt3/ldiPart1g.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiPart1g.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiPart1g.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiPart1g.inc diff --git a/mtr/csinternal/include/dbt3/ldiPart1m.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiPart1m.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiPart1m.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiPart1m.inc diff --git a/mtr/csinternal/include/dbt3/ldiPartsupp1g.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiPartsupp1g.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiPartsupp1g.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiPartsupp1g.inc diff --git a/mtr/csinternal/include/dbt3/ldiPartsupp1m.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiPartsupp1m.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiPartsupp1m.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiPartsupp1m.inc diff --git a/mtr/csinternal/include/dbt3/ldiRegion1g.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiRegion1g.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiRegion1g.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiRegion1g.inc diff --git a/mtr/csinternal/include/dbt3/ldiRegion1m.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiRegion1m.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiRegion1m.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiRegion1m.inc diff --git a/mtr/csinternal/include/dbt3/ldiSupplier1g.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiSupplier1g.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiSupplier1g.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiSupplier1g.inc diff --git a/mtr/csinternal/include/dbt3/ldiSupplier1m.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiSupplier1m.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiSupplier1m.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiSupplier1m.inc diff --git a/mtr/csinternal/include/dbt3/ldiTables1g.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiTables1g.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiTables1g.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiTables1g.inc diff --git a/mtr/csinternal/include/dbt3/ldiTables1m.inc b/mysql-test/columnstore/csinternal/include/dbt3/ldiTables1m.inc similarity index 100% rename from mtr/csinternal/include/dbt3/ldiTables1m.inc rename to mysql-test/columnstore/csinternal/include/dbt3/ldiTables1m.inc diff --git a/mtr/csinternal/include/get_casual_partition_info.inc b/mysql-test/columnstore/csinternal/include/get_casual_partition_info.inc similarity index 100% rename from mtr/csinternal/include/get_casual_partition_info.inc rename to mysql-test/columnstore/csinternal/include/get_casual_partition_info.inc diff --git a/mtr/csinternal/include/have_columnstore.inc b/mysql-test/columnstore/csinternal/include/have_columnstore.inc similarity index 100% rename from mtr/csinternal/include/have_columnstore.inc rename to mysql-test/columnstore/csinternal/include/have_columnstore.inc diff --git a/mtr/csinternal/include/regression_create_datatypetestm.inc b/mysql-test/columnstore/csinternal/include/regression_create_datatypetestm.inc similarity index 100% rename from mtr/csinternal/include/regression_create_datatypetestm.inc rename to mysql-test/columnstore/csinternal/include/regression_create_datatypetestm.inc diff --git a/mtr/csinternal/include/regression_create_datatypetestm1.inc b/mysql-test/columnstore/csinternal/include/regression_create_datatypetestm1.inc similarity index 100% rename from mtr/csinternal/include/regression_create_datatypetestm1.inc rename to mysql-test/columnstore/csinternal/include/regression_create_datatypetestm1.inc diff --git a/mtr/csinternal/include/regression_create_dtypes.inc b/mysql-test/columnstore/csinternal/include/regression_create_dtypes.inc similarity index 100% rename from mtr/csinternal/include/regression_create_dtypes.inc rename to mysql-test/columnstore/csinternal/include/regression_create_dtypes.inc diff --git a/mtr/csinternal/include/regression_create_empsalary.inc b/mysql-test/columnstore/csinternal/include/regression_create_empsalary.inc similarity index 100% rename from mtr/csinternal/include/regression_create_empsalary.inc rename to mysql-test/columnstore/csinternal/include/regression_create_empsalary.inc diff --git a/mtr/csinternal/include/regression_create_misc_tables.inc b/mysql-test/columnstore/csinternal/include/regression_create_misc_tables.inc similarity index 100% rename from mtr/csinternal/include/regression_create_misc_tables.inc rename to mysql-test/columnstore/csinternal/include/regression_create_misc_tables.inc diff --git a/mtr/csinternal/include/regression_create_simple_subselect.inc b/mysql-test/columnstore/csinternal/include/regression_create_simple_subselect.inc similarity index 100% rename from mtr/csinternal/include/regression_create_simple_subselect.inc rename to mysql-test/columnstore/csinternal/include/regression_create_simple_subselect.inc diff --git a/mtr/csinternal/include/regression_create_wide_tables.inc b/mysql-test/columnstore/csinternal/include/regression_create_wide_tables.inc similarity index 100% rename from mtr/csinternal/include/regression_create_wide_tables.inc rename to mysql-test/columnstore/csinternal/include/regression_create_wide_tables.inc diff --git a/mtr/csinternal/include/ssb/countCustomer.inc b/mysql-test/columnstore/csinternal/include/ssb/countCustomer.inc similarity index 100% rename from mtr/csinternal/include/ssb/countCustomer.inc rename to mysql-test/columnstore/csinternal/include/ssb/countCustomer.inc diff --git a/mtr/csinternal/include/ssb/countDateinfo.inc b/mysql-test/columnstore/csinternal/include/ssb/countDateinfo.inc similarity index 100% rename from mtr/csinternal/include/ssb/countDateinfo.inc rename to mysql-test/columnstore/csinternal/include/ssb/countDateinfo.inc diff --git a/mtr/csinternal/include/ssb/countLineorder.inc b/mysql-test/columnstore/csinternal/include/ssb/countLineorder.inc similarity index 100% rename from mtr/csinternal/include/ssb/countLineorder.inc rename to mysql-test/columnstore/csinternal/include/ssb/countLineorder.inc diff --git a/mtr/csinternal/include/ssb/countPart.inc b/mysql-test/columnstore/csinternal/include/ssb/countPart.inc similarity index 100% rename from mtr/csinternal/include/ssb/countPart.inc rename to mysql-test/columnstore/csinternal/include/ssb/countPart.inc diff --git a/mtr/csinternal/include/ssb/countSupplier.inc b/mysql-test/columnstore/csinternal/include/ssb/countSupplier.inc similarity index 100% rename from mtr/csinternal/include/ssb/countSupplier.inc rename to mysql-test/columnstore/csinternal/include/ssb/countSupplier.inc diff --git a/mtr/csinternal/include/ssb/countTables.inc b/mysql-test/columnstore/csinternal/include/ssb/countTables.inc similarity index 100% rename from mtr/csinternal/include/ssb/countTables.inc rename to mysql-test/columnstore/csinternal/include/ssb/countTables.inc diff --git a/mtr/csinternal/include/ssb/createCustomer.inc b/mysql-test/columnstore/csinternal/include/ssb/createCustomer.inc similarity index 100% rename from mtr/csinternal/include/ssb/createCustomer.inc rename to mysql-test/columnstore/csinternal/include/ssb/createCustomer.inc diff --git a/mtr/csinternal/include/ssb/createDateinfo.inc b/mysql-test/columnstore/csinternal/include/ssb/createDateinfo.inc similarity index 100% rename from mtr/csinternal/include/ssb/createDateinfo.inc rename to mysql-test/columnstore/csinternal/include/ssb/createDateinfo.inc diff --git a/mtr/csinternal/include/ssb/createLineorder.inc b/mysql-test/columnstore/csinternal/include/ssb/createLineorder.inc similarity index 100% rename from mtr/csinternal/include/ssb/createLineorder.inc rename to mysql-test/columnstore/csinternal/include/ssb/createLineorder.inc diff --git a/mtr/csinternal/include/ssb/createPart.inc b/mysql-test/columnstore/csinternal/include/ssb/createPart.inc similarity index 100% rename from mtr/csinternal/include/ssb/createPart.inc rename to mysql-test/columnstore/csinternal/include/ssb/createPart.inc diff --git a/mtr/csinternal/include/ssb/createSupplier.inc b/mysql-test/columnstore/csinternal/include/ssb/createSupplier.inc similarity index 100% rename from mtr/csinternal/include/ssb/createSupplier.inc rename to mysql-test/columnstore/csinternal/include/ssb/createSupplier.inc diff --git a/mtr/csinternal/include/ssb/createTables.inc b/mysql-test/columnstore/csinternal/include/ssb/createTables.inc similarity index 100% rename from mtr/csinternal/include/ssb/createTables.inc rename to mysql-test/columnstore/csinternal/include/ssb/createTables.inc diff --git a/mtr/csinternal/include/ssb/dropCustomer.inc b/mysql-test/columnstore/csinternal/include/ssb/dropCustomer.inc similarity index 100% rename from mtr/csinternal/include/ssb/dropCustomer.inc rename to mysql-test/columnstore/csinternal/include/ssb/dropCustomer.inc diff --git a/mtr/csinternal/include/ssb/dropDateinfo.inc b/mysql-test/columnstore/csinternal/include/ssb/dropDateinfo.inc similarity index 100% rename from mtr/csinternal/include/ssb/dropDateinfo.inc rename to mysql-test/columnstore/csinternal/include/ssb/dropDateinfo.inc diff --git a/mtr/csinternal/include/ssb/dropLineorder.inc b/mysql-test/columnstore/csinternal/include/ssb/dropLineorder.inc similarity index 100% rename from mtr/csinternal/include/ssb/dropLineorder.inc rename to mysql-test/columnstore/csinternal/include/ssb/dropLineorder.inc diff --git a/mtr/csinternal/include/ssb/dropPart.inc b/mysql-test/columnstore/csinternal/include/ssb/dropPart.inc similarity index 100% rename from mtr/csinternal/include/ssb/dropPart.inc rename to mysql-test/columnstore/csinternal/include/ssb/dropPart.inc diff --git a/mtr/csinternal/include/ssb/dropSupplier.inc b/mysql-test/columnstore/csinternal/include/ssb/dropSupplier.inc similarity index 100% rename from mtr/csinternal/include/ssb/dropSupplier.inc rename to mysql-test/columnstore/csinternal/include/ssb/dropSupplier.inc diff --git a/mtr/csinternal/include/ssb/dropTables.inc b/mysql-test/columnstore/csinternal/include/ssb/dropTables.inc similarity index 100% rename from mtr/csinternal/include/ssb/dropTables.inc rename to mysql-test/columnstore/csinternal/include/ssb/dropTables.inc diff --git a/mtr/csinternal/include/ssb/ldiCustomer1g.inc b/mysql-test/columnstore/csinternal/include/ssb/ldiCustomer1g.inc similarity index 100% rename from mtr/csinternal/include/ssb/ldiCustomer1g.inc rename to mysql-test/columnstore/csinternal/include/ssb/ldiCustomer1g.inc diff --git a/mtr/csinternal/include/ssb/ldiDateinfo1g.inc b/mysql-test/columnstore/csinternal/include/ssb/ldiDateinfo1g.inc similarity index 100% rename from mtr/csinternal/include/ssb/ldiDateinfo1g.inc rename to mysql-test/columnstore/csinternal/include/ssb/ldiDateinfo1g.inc diff --git a/mtr/csinternal/include/ssb/ldiLineorder1g.inc b/mysql-test/columnstore/csinternal/include/ssb/ldiLineorder1g.inc similarity index 100% rename from mtr/csinternal/include/ssb/ldiLineorder1g.inc rename to mysql-test/columnstore/csinternal/include/ssb/ldiLineorder1g.inc diff --git a/mtr/csinternal/include/ssb/ldiPart1g.inc b/mysql-test/columnstore/csinternal/include/ssb/ldiPart1g.inc similarity index 100% rename from mtr/csinternal/include/ssb/ldiPart1g.inc rename to mysql-test/columnstore/csinternal/include/ssb/ldiPart1g.inc diff --git a/mtr/csinternal/include/ssb/ldiSupplier1g.inc b/mysql-test/columnstore/csinternal/include/ssb/ldiSupplier1g.inc similarity index 100% rename from mtr/csinternal/include/ssb/ldiSupplier1g.inc rename to mysql-test/columnstore/csinternal/include/ssb/ldiSupplier1g.inc diff --git a/mtr/csinternal/include/ssb/ldiTables1g.inc b/mysql-test/columnstore/csinternal/include/ssb/ldiTables1g.inc similarity index 100% rename from mtr/csinternal/include/ssb/ldiTables1g.inc rename to mysql-test/columnstore/csinternal/include/ssb/ldiTables1g.inc diff --git a/mtr/csinternal/regression_env_setup.test b/mysql-test/columnstore/csinternal/regression_env_setup.test similarity index 100% rename from mtr/csinternal/regression_env_setup.test rename to mysql-test/columnstore/csinternal/regression_env_setup.test diff --git a/mtr/extended/test.txt b/mysql-test/columnstore/extended/test.txt similarity index 100% rename from mtr/extended/test.txt rename to mysql-test/columnstore/extended/test.txt diff --git a/mtr/future/failed.def b/mysql-test/columnstore/future/failed.def similarity index 100% rename from mtr/future/failed.def rename to mysql-test/columnstore/future/failed.def diff --git a/mtr/future/mcol641-aggregate.result b/mysql-test/columnstore/future/mcol641-aggregate.result similarity index 100% rename from mtr/future/mcol641-aggregate.result rename to mysql-test/columnstore/future/mcol641-aggregate.result diff --git a/mtr/future/mcol641-aggregate.test b/mysql-test/columnstore/future/mcol641-aggregate.test similarity index 100% rename from mtr/future/mcol641-aggregate.test rename to mysql-test/columnstore/future/mcol641-aggregate.test diff --git a/mtr/future/mcol641-arithmetic.result b/mysql-test/columnstore/future/mcol641-arithmetic.result similarity index 100% rename from mtr/future/mcol641-arithmetic.result rename to mysql-test/columnstore/future/mcol641-arithmetic.result diff --git a/mtr/future/mcol641-arithmetic.test b/mysql-test/columnstore/future/mcol641-arithmetic.test similarity index 100% rename from mtr/future/mcol641-arithmetic.test rename to mysql-test/columnstore/future/mcol641-arithmetic.test diff --git a/mtr/future/mcol641-create.result b/mysql-test/columnstore/future/mcol641-create.result similarity index 100% rename from mtr/future/mcol641-create.result rename to mysql-test/columnstore/future/mcol641-create.result diff --git a/mtr/future/mcol641-create.test b/mysql-test/columnstore/future/mcol641-create.test similarity index 100% rename from mtr/future/mcol641-create.test rename to mysql-test/columnstore/future/mcol641-create.test diff --git a/mtr/future/mcol641-delete.result b/mysql-test/columnstore/future/mcol641-delete.result similarity index 100% rename from mtr/future/mcol641-delete.result rename to mysql-test/columnstore/future/mcol641-delete.result diff --git a/mtr/future/mcol641-delete.test b/mysql-test/columnstore/future/mcol641-delete.test similarity index 100% rename from mtr/future/mcol641-delete.test rename to mysql-test/columnstore/future/mcol641-delete.test diff --git a/mtr/future/mcol641-functions.result b/mysql-test/columnstore/future/mcol641-functions.result similarity index 100% rename from mtr/future/mcol641-functions.result rename to mysql-test/columnstore/future/mcol641-functions.result diff --git a/mtr/future/mcol641-functions.test b/mysql-test/columnstore/future/mcol641-functions.test similarity index 100% rename from mtr/future/mcol641-functions.test rename to mysql-test/columnstore/future/mcol641-functions.test diff --git a/mtr/future/mcol641-insert.result b/mysql-test/columnstore/future/mcol641-insert.result similarity index 100% rename from mtr/future/mcol641-insert.result rename to mysql-test/columnstore/future/mcol641-insert.result diff --git a/mtr/future/mcol641-insert.test b/mysql-test/columnstore/future/mcol641-insert.test similarity index 100% rename from mtr/future/mcol641-insert.test rename to mysql-test/columnstore/future/mcol641-insert.test diff --git a/mtr/future/mcol641-joins.result b/mysql-test/columnstore/future/mcol641-joins.result similarity index 100% rename from mtr/future/mcol641-joins.result rename to mysql-test/columnstore/future/mcol641-joins.result diff --git a/mtr/future/mcol641-joins.test b/mysql-test/columnstore/future/mcol641-joins.test similarity index 100% rename from mtr/future/mcol641-joins.test rename to mysql-test/columnstore/future/mcol641-joins.test diff --git a/mtr/future/mcol641-sorting.result b/mysql-test/columnstore/future/mcol641-sorting.result similarity index 100% rename from mtr/future/mcol641-sorting.result rename to mysql-test/columnstore/future/mcol641-sorting.result diff --git a/mtr/future/mcol641-sorting.test b/mysql-test/columnstore/future/mcol641-sorting.test similarity index 100% rename from mtr/future/mcol641-sorting.test rename to mysql-test/columnstore/future/mcol641-sorting.test diff --git a/mtr/future/mcol641-union.result b/mysql-test/columnstore/future/mcol641-union.result similarity index 100% rename from mtr/future/mcol641-union.result rename to mysql-test/columnstore/future/mcol641-union.result diff --git a/mtr/future/mcol641-union.test b/mysql-test/columnstore/future/mcol641-union.test similarity index 100% rename from mtr/future/mcol641-union.test rename to mysql-test/columnstore/future/mcol641-union.test diff --git a/mtr/future/mcol641-update.result b/mysql-test/columnstore/future/mcol641-update.result similarity index 100% rename from mtr/future/mcol641-update.result rename to mysql-test/columnstore/future/mcol641-update.result diff --git a/mtr/future/mcol641-update.test b/mysql-test/columnstore/future/mcol641-update.test similarity index 100% rename from mtr/future/mcol641-update.test rename to mysql-test/columnstore/future/mcol641-update.test diff --git a/mtr/include/combinations.myisam-columnstore.combinations b/mysql-test/columnstore/include/combinations.myisam-columnstore.combinations similarity index 100% rename from mtr/include/combinations.myisam-columnstore.combinations rename to mysql-test/columnstore/include/combinations.myisam-columnstore.combinations diff --git a/mtr/include/combinations.myisam-columnstore.inc b/mysql-test/columnstore/include/combinations.myisam-columnstore.inc similarity index 100% rename from mtr/include/combinations.myisam-columnstore.inc rename to mysql-test/columnstore/include/combinations.myisam-columnstore.inc diff --git a/mtr/include/have_columnstore.inc b/mysql-test/columnstore/include/have_columnstore.inc similarity index 100% rename from mtr/include/have_columnstore.inc rename to mysql-test/columnstore/include/have_columnstore.inc diff --git a/mtr/include/mcs3_create_table_charset_collations.inc b/mysql-test/columnstore/include/mcs3_create_table_charset_collations.inc similarity index 100% rename from mtr/include/mcs3_create_table_charset_collations.inc rename to mysql-test/columnstore/include/mcs3_create_table_charset_collations.inc diff --git a/mtr/std_data/100Krows.dat b/mysql-test/columnstore/std_data/100Krows.dat similarity index 100% rename from mtr/std_data/100Krows.dat rename to mysql-test/columnstore/std_data/100Krows.dat diff --git a/mtr/std_data/1m_customer.tbl b/mysql-test/columnstore/std_data/1m_customer.tbl similarity index 100% rename from mtr/std_data/1m_customer.tbl rename to mysql-test/columnstore/std_data/1m_customer.tbl diff --git a/mtr/std_data/1m_orders.tbl b/mysql-test/columnstore/std_data/1m_orders.tbl similarity index 100% rename from mtr/std_data/1m_orders.tbl rename to mysql-test/columnstore/std_data/1m_orders.tbl diff --git a/mtr/std_data/loaddata1.dat b/mysql-test/columnstore/std_data/loaddata1.dat similarity index 100% rename from mtr/std_data/loaddata1.dat rename to mysql-test/columnstore/std_data/loaddata1.dat diff --git a/mtr/std_data/loaddata2.dat b/mysql-test/columnstore/std_data/loaddata2.dat similarity index 100% rename from mtr/std_data/loaddata2.dat rename to mysql-test/columnstore/std_data/loaddata2.dat diff --git a/mtr/std_data/loaddata3.dat b/mysql-test/columnstore/std_data/loaddata3.dat similarity index 100% rename from mtr/std_data/loaddata3.dat rename to mysql-test/columnstore/std_data/loaddata3.dat diff --git a/mtr/std_data/loaddata4.dat b/mysql-test/columnstore/std_data/loaddata4.dat similarity index 100% rename from mtr/std_data/loaddata4.dat rename to mysql-test/columnstore/std_data/loaddata4.dat