Merge branch 'stable-23.10' into MCOL-5964-support-5861-dev

2025-08-10 01:22:48 +03:00 · 2025-07-04 15:50:21 +04:00
parent 9ce8c48bbd dd4cfebaf4
commit db2c514f85
232 changed files with 8100 additions and 2892 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,18 +1,18 @@
 local events = ["pull_request", "cron"];

+
+local current_branch = "stable-23.10";
+
 local servers = {
-  develop: ["10.6-enterprise"],
  "stable-23.10": ["10.6-enterprise"],
 };

 local platforms = {
-  develop: ["rockylinux:8", "rockylinux:9", "debian:12", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04"],
-  "stable-23.10": ["rockylinux:8", "rockylinux:9", "debian:12", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04"],
+  "stable-23.10": ["rockylinux:8", "rockylinux:9", "debian:12", "ubuntu:22.04", "ubuntu:24.04"],
 };

 local platforms_arm = {
-  develop: ["rockylinux:8", "rockylinux:9", "debian:12", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04"],
-  "stable-23.10": ["rockylinux:8", "rockylinux:9", "debian:12", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04"],
+  "stable-23.10": ["rockylinux:8", "rockylinux:9", "debian:12", "ubuntu:22.04", "ubuntu:24.04"],
 };

 local rewrite_ubuntu_mirror = @"sed -i 's|//\\(us\\.\\)\\?archive\\.ubuntu\\.com|//us.archive.ubuntu.com|g' /etc/apt/sources.list || true; " +
@@ -56,10 +56,10 @@ local customBootstrapParamsForAdditionalPipelinesMap = {


 local any_branch = "**";
-local platforms_custom = platforms.develop;
-local platforms_arm_custom = platforms_arm.develop;
+local platforms_custom = platforms[current_branch];
+local platforms_arm_custom = platforms_arm[current_branch];

-local platforms_mtr = platforms.develop;
+local platforms_mtr = platforms[current_branch];

 local builddir = "verylongdirnameforverystrangecpackbehavior";

@@ -146,7 +146,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
  local socket_path = if (pkg_format == "rpm") then "/var/lib/mysql/mysql.sock" else "/run/mysqld/mysqld.sock",
  local config_path_prefix = if (pkg_format == "rpm") then "/etc/my.cnf.d/" else "/etc/mysql/mariadb.conf.d/50-",
  local img = if (platform == "rockylinux:8") then platform else "detravi/" + std.strReplace(platform, "/", "-"),
-  local branch_ref = if (branch == any_branch) then "stable-23.10" else branch,
+  local branch_ref = if (branch == any_branch) then current_branch else branch,
  // local regression_tests = if (std.startsWith(platform, 'debian') || std.startsWith(platform, 'ubuntu:20')) then 'test000.sh' else 'test000.sh,test001.sh',

  local branchp = if (branch == "**") then "" else branch + "/",
@@ -176,7 +176,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
  publish(step_prefix="pkg", eventp=event + "/${DRONE_BUILD_NUMBER}"):: {
    name: "publish " + step_prefix,
    depends_on: [std.strReplace(step_prefix, " latest", ""), "createrepo"],
-    image: "amazon/aws-cli:2.23.5",
+    image: "amazon/aws-cli:2.22.30",
    when: {
      status: ["success", "failure"],
    },
@@ -248,8 +248,8 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
    if (pkg_format == "deb") then execInnerDocker('bash -c "apt-get clean && apt-get update -y && apt-get install -y mariadb-columnstore-cmapi"', containerName)
    else execInnerDocker('bash -c "yum update -y && yum install -y MariaDB-columnstore-cmapi"', containerName),

-  local prepareTestStage(containerName, result, do_setup) =
-    'sh -c "apk add bash && bash /mdb/' + builddir + "/storage/columnstore/columnstore/build/prepare_test_stage.sh" +
+  local prepareTestContainer(containerName, result, do_setup) =
+    'sh -c "apk add bash && bash /mdb/' + builddir + "/storage/columnstore/columnstore/build/prepare_test_container.sh" +
    " --container-name " + containerName +
    " --docker-image " + img +
    " --result-path " + result +
@@ -274,7 +274,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
    image: "docker:28.2.2",
    volumes: [pipeline._volumes.mdb, pipeline._volumes.docker],
    commands: [
-      prepareTestStage(getContainerName("smoke"), result, true),
+      prepareTestContainer(getContainerName("smoke"), result, true),
      "bash /mdb/" + builddir + "/storage/columnstore/columnstore/build/run_smoke.sh " + getContainerName("smoke"),
    ],
  },
@@ -302,7 +302,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
    },
    commands: [
      // why do we mount cgroups here, but miss it on other steps?
-      prepareTestStage(getContainerName("upgrade") + version, result, false),
+      prepareTestContainer(getContainerName("upgrade") + version, result, false),
      if (pkg_format == "deb")
      then execInnerDocker('bash -c "./upgrade_setup_deb.sh ' + version + " " + result + " " + arch + " " + repo_pkg_url_no_res + ' $${UPGRADE_TOKEN}"',
                           getContainerName("upgrade") + version),
@@ -341,37 +341,14 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
      MTR_FULL_SUITE: "${MTR_FULL_SUITE:-false}",
    },
    commands: [
-      prepareTestStage(getContainerName("mtr"), result, true),
-      "docker cp mysql-test/columnstore mtr$${DRONE_BUILD_NUMBER}:" + mtr_path + "/suite/",
-      execInnerDocker("chown -R mysql:mysql " + mtr_path, getContainerName("mtr")),
-      // disable systemd 'ProtectSystem' (we need to write to /usr/share/)
-      execInnerDocker("bash -c 'sed -i /ProtectSystem/d $(systemctl show --property FragmentPath mariadb | sed s/FragmentPath=//)'", getContainerName("mtr")),
-      execInnerDocker("systemctl daemon-reload", getContainerName("mtr")),
-      execInnerDocker("systemctl start mariadb", getContainerName("mtr")),
-      // Set RAM consumption limits to avoid RAM contention b/w mtr and regression steps.
-      execInnerDocker("/usr/bin/mcsSetConfig SystemConfig CGroup just_no_group_use_local", getContainerName("mtr")),
-      execInnerDocker('mariadb -e "create database if not exists test;"', getContainerName("mtr")),
-      execInnerDocker("systemctl restart mariadb-columnstore", getContainerName("mtr")),
-
-      // delay mtr for manual debugging on live instance
-      "sleep $${MTR_DELAY_SECONDS:-1s}",
+      prepareTestContainer(getContainerName("mtr"), result, true),
      'MTR_SUITE_LIST=$([ "$MTR_FULL_SUITE" == true ] && echo "' + mtr_full_set + '" || echo "$MTR_SUITE_LIST")',
-      if (event == "custom" || event == "cron") then
-        execInnerDocker('bash -c "wget -qO- https://cspkg.s3.amazonaws.com/mtr-test-data.tar.lz4 | lz4 -dc - | tar xf - -C /"',
-                        getContainerName("mtr")),
-      if (event == "custom" || event == "cron") then
-        execInnerDocker('bash -c "cd ' + mtr_path + " && ./mtr --extern socket=" + socket_path + ' --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/setup"',
-                        getContainerName("mtr")),

-      if (event == "cron") then
-        execInnerDocker('bash -c "cd ' + mtr_path + " && ./mtr --extern socket=" + socket_path +
-                        " --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite="
-                        + std.join(",", std.map(function(x) "columnstore/" + x, std.split(mtr_full_set, ","))),
-                        getContainerName("mtr")) + '"'
-      else
-        execInnerDocker('bash -c "cd ' + mtr_path + " && ./mtr --extern socket=" + socket_path +
-                        ' --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/$${MTR_SUITE_LIST//,/,columnstore/}"',
-                        getContainerName("mtr")),
+      'apk add bash && bash /mdb/' + builddir + '/storage/columnstore/columnstore/build/run_mtr.sh' +
+      ' --container-name ' + getContainerName("mtr") +
+      ' --distro ' + platform +
+      ' --suite-list $${MTR_SUITE_LIST}' +
+      ' --triggering-event ' + event,
    ],
  },
  mtrlog:: {
@@ -386,66 +363,11 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
      status: ["success", "failure"],
    },
  },
-  prepare_regression:: {
-    name: "prepare regression",
-    depends_on: ["mtr", "publish pkg", "publish cmapi build"],
-    when: {
-      status: ["success", "failure"],
-    },
-    image: "docker:git",
-    volumes: [pipeline._volumes.docker, pipeline._volumes.mdb],
-    environment: {
-      REGRESSION_BRANCH_REF: "${DRONE_SOURCE_BRANCH}",
-      REGRESSION_REF_AUX: branch_ref,
-    },
-    commands: [
-      // compute branch.
-      'echo "$$REGRESSION_REF"',
-      'echo "$$REGRESSION_BRANCH_REF"',
-      // if REGRESSION_REF is empty, try to see whether regression repository has a branch named as one we PR.
-      'export REGRESSION_REF=$${REGRESSION_REF:-$$(git ls-remote https://github.com/mariadb-corporation/mariadb-columnstore-regression-test --h --sort origin "refs/heads/$$REGRESSION_BRANCH_REF" | grep -E -o "[^/]+$$")}',
-      'echo "$$REGRESSION_REF"',
-      // REGRESSION_REF can be empty if there is no appropriate branch in regression repository.
-      // assign what is appropriate by default.
-      "export REGRESSION_REF=$${REGRESSION_REF:-$$REGRESSION_REF_AUX}",
-      'echo "$$REGRESSION_REF"',
-      // clone regression test repo
-      "git clone --recurse-submodules --branch $$REGRESSION_REF --depth 1 https://github.com/mariadb-corporation/mariadb-columnstore-regression-test",
-      // where are we now?
-      "cd mariadb-columnstore-regression-test",
-      "git rev-parse --abbrev-ref HEAD && git rev-parse HEAD",
-      "cd ..",
-      prepareTestStage(getContainerName("regression"), result, true),
-
-      "docker cp mariadb-columnstore-regression-test regression$${DRONE_BUILD_NUMBER}:/",
-      // list storage manager binary
-      "ls -la /mdb/" + builddir + "/storage/columnstore/columnstore/storage-manager",
-      "docker cp /mdb/" + builddir + "/storage/columnstore/columnstore/storage-manager regression$${DRONE_BUILD_NUMBER}:/",
-      // check storage-manager unit test binary file
-      execInnerDocker("ls -l /storage-manager", getContainerName("regression")),
-      // copy test data for regression test suite
-      execInnerDocker('bash -c "wget -qO- https://cspkg.s3.amazonaws.com/testData.tar.lz4 | lz4 -dc - | tar xf - -C mariadb-columnstore-regression-test/"', getContainerName("regression")),
-
-      // set mariadb lower_case_table_names=1 config option
-      execInnerDocker('sed -i "/^.mariadb.$/a lower_case_table_names=1" ' + config_path_prefix + "server.cnf", getContainerName("regression")),
-      // set default client character set to utf-8
-      execInnerDocker('sed -i "/^.client.$/a default-character-set=utf8" ' + config_path_prefix + "client.cnf", getContainerName("regression")),
-
-      // Set RAM consumption limits to avoid RAM contention b/w mtr andregression steps.
-      execInnerDocker("/usr/bin/mcsSetConfig SystemConfig CGroup just_no_group_use_local", getContainerName("regression")),
-
-      execInnerDocker("systemctl start mariadb", getContainerName("regression")),
-      execInnerDocker("systemctl restart mariadb-columnstore", getContainerName("regression")),
-      // delay regression for manual debugging on live instance
-      "sleep $${REGRESSION_DELAY_SECONDS:-1s}",
-      execInnerDocker("/usr/bin/g++ /mariadb-columnstore-regression-test/mysql/queries/queryTester.cpp -O2 -o  /mariadb-columnstore-regression-test/mysql/queries/queryTester", getContainerName("regression")),
-    ],
-  },
  regression(name, depends_on):: {
    name: name,
    depends_on: depends_on,
    image: "docker:git",
-    volumes: [pipeline._volumes.docker],
+    volumes: [pipeline._volumes.docker, pipeline._volumes.mdb],
    when: {
      status: ["success", "failure"],
    },
@@ -454,14 +376,24 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
      REGRESSION_TIMEOUT: {
        from_secret: "regression_timeout",
      },
+      REGRESSION_BRANCH_REF: "${DRONE_SOURCE_BRANCH}",
+      REGRESSION_REF_AUX: branch_ref,
    },
    commands: [
-      execInnerDocker("mkdir -p reg-logs", getContainerName("regression"), "--workdir /mariadb-columnstore-regression-test/mysql/queries/nightly/alltest"),
-      execInnerDocker("bash -c 'sleep 4800 && bash /save_stack.sh /mariadb-columnstore-regression-test/mysql/queries/nightly/alltest/reg-logs/' & ",
-                      getContainerName("regresion")),
-      execInnerDockerNoTTY('bash -c "timeout -k 1m -s SIGKILL --preserve-status $${REGRESSION_TIMEOUT} ./go.sh --sm_unit_test_dir=/storage-manager --tests=' + name + " || ./regression_logs.sh " + name + '"',
-                           getContainerName("regression"),
-                           "--env PRESERVE_LOGS=true --workdir /mariadb-columnstore-regression-test/mysql/queries/nightly/alltest"),
+      prepareTestContainer(getContainerName("regression"), result, true),
+
+      // REGRESSION_REF can be empty if there is no appropriate branch in regression repository.
+      // if REGRESSION_REF is empty, try to see whether regression repository has a branch named as one we PR.
+      'export REGRESSION_REF=$${REGRESSION_REF:-$$(git ls-remote https://github.com/mariadb-corporation/mariadb-columnstore-regression-test --h --sort origin "refs/heads/$$REGRESSION_BRANCH_REF" | grep -E -o "[^/]+$$")}',
+      "export REGRESSION_REF=$${REGRESSION_REF:-$$REGRESSION_REF_AUX}",
+      'echo "$$REGRESSION_REF"',
+
+      "apk add bash && bash /mdb/" + builddir + "/storage/columnstore/columnstore/build/run_regression.sh" +
+      " --container-name " + getContainerName("regression") +
+      " --test-name " + name +
+      " --distro " + platform +
+      " --regression-branch $$REGRESSION_REF" +
+      " --regression-timeout $${REGRESSION_TIMEOUT}",
    ],
  },
  regressionlog:: {
@@ -537,7 +469,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
      PYTHONPATH: "/usr/share/columnstore/cmapi/deps",
    },
    commands: [
-      prepareTestStage(getContainerName("cmapi"), result, true),
+      prepareTestContainer(getContainerName("cmapi"), result, true),
      installCmapi(getContainerName("cmapi"), pkg_format),
      "cd cmapi",
      "for i in mcs_node_control cmapi_server failover; do docker cp $${i}/test cmapi$${DRONE_BUILD_NUMBER}:" + cmapi_path + "/$${i}/; done",
@@ -750,8 +682,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
         [pipeline.cmapilog] +
         [pipeline.publish("cmapilog")] +
         (if (platform == "rockylinux:8" && arch == "amd64") then [pipeline.dockerfile] + [pipeline.dockerhub] + [pipeline.multi_node_mtr] else [pipeline.mtr] + [pipeline.mtrlog] + [pipeline.publish("mtrlog")]) +
-         [pipeline.prepare_regression] +
-         [pipeline.regression(regression_tests[i], [if (i == 0) then "prepare regression" else regression_tests[i - 1]]) for i in indexes(regression_tests)] +
+         [pipeline.regression(regression_tests[i], if (i == 0) then ["mtr", "publish pkg", "publish cmapi build"] else [regression_tests[i - 1]]) for i in indexes(regression_tests)] +
         [pipeline.regressionlog] +
         [pipeline.publish("regressionlog")] +
         // [pipeline.upgrade(mdb_server_versions[i]) for i in indexes(mdb_server_versions)] +
@@ -792,8 +723,8 @@ local FinalPipeline(branch, event) = {
      "failure",
    ],
  } + (if event == "cron" then { cron: ["nightly-" + std.strReplace(branch, ".", "-")] } else {}),
-  depends_on: std.map(function(p) std.join(" ", [branch, p, event, "amd64", "10.6-enterprise", "", ""]), platforms.develop) +
-              std.map(function(p) std.join(" ", [branch, p, event, "arm64", "10.6-enterprise", "", ""]), platforms_arm.develop),
+  depends_on: std.map(function(p) std.join(" ", [branch, p, event, "amd64", "10.6-enterprise", "", ""]), platforms[current_branch]),
+  // +std.map(function(p) std.join(" ", [branch, p, event, "arm64", "10.6-enterprise", "", ""]), platforms_arm.develop),
 };

 [
@@ -803,13 +734,13 @@ local FinalPipeline(branch, event) = {
  for s in servers[b]
  for e in events
 ] +
-[
-  Pipeline(b, p, e, "arm64", s)
-  for b in std.objectFields(platforms_arm)
-  for p in platforms_arm[b]
-  for s in servers[b]
-  for e in events
-] +
+// [
+//   Pipeline(b, p, e, "arm64", s)
+//   for b in std.objectFields(platforms_arm)
+//   for p in platforms_arm[b]
+//   for s in servers[b]
+//   for e in events
+// ] +

 [
  FinalPipeline(b, "cron")
@@ -820,11 +751,11 @@ local FinalPipeline(branch, event) = {
  Pipeline(any_branch, p, "custom", "amd64", "10.6-enterprise")
  for p in platforms_custom
 ] +
-[
-  Pipeline(any_branch, p, "custom", "arm64", "10.6-enterprise")
-  for p in platforms_arm_custom
-]
-+
+// [
+//   Pipeline(any_branch, p, "custom", "arm64", "10.6-enterprise")
+//   for p in platforms_arm_custom
+// ]
+// +
 [
  Pipeline(b, platform, triggeringEvent, a, server, "", buildenv)
  for a in ["amd64"]
@@ -832,5 +763,5 @@ local FinalPipeline(branch, event) = {
  for platform in ["ubuntu:24.04"]
  for buildenv in std.objectFields(customEnvCommandsMap)
  for triggeringEvent in events
-  for server in servers.develop
+  for server in servers[current_branch]
 ]
--- a/build/bootstrap_mcs.sh
+++ b/build/bootstrap_mcs.sh
@@ -574,11 +574,15 @@ run_microbenchmarks_tests() {

 disable_plugins_for_bootstrap() {
    find /etc -type f -exec sed -i 's/plugin-load-add=auth_gssapi.so//g' {} +
-    find /etc -type f -exec sed -i 's/plugin-load-add=ha_columnstore.so//g' {} +
+    find /etc -type f -exec sed -i 's/plugin-load-add=ha_columnstore.so/#plugin-load-add=ha_columnstore.so/g' {} +
 }

 enable_columnstore_back() {
-    cp "$MDB_SOURCE_PATH"/storage/columnstore/columnstore/dbcon/mysql/columnstore.cnf $CONFIG_DIR
+    if [[ "$NO_CLEAN" == true ]]; then
+        find /etc -type f -exec sed -i 's/#plugin-load-add=ha_columnstore.so/plugin-load-add=ha_columnstore.so/g' {} +
+    else
+        cp "$MDB_SOURCE_PATH"/storage/columnstore/columnstore/dbcon/mysql/columnstore.cnf $CONFIG_DIR
+    fi
 }

 fix_config_files() {
@@ -594,6 +598,7 @@ fix_config_files() {
        if grep -q thread_stack $COLUMNSTORE_CONFIG; then
            warn "MDB Server has thread_stack settings on $COLUMNSTORE_CONFIG check it's compatibility with ASAN"
        else
+            echo "" >>$COLUMNSTORE_CONFIG
            echo "thread_stack = ${THREAD_STACK_SIZE}" >>$COLUMNSTORE_CONFIG
            message "thread_stack was set to ${THREAD_STACK_SIZE} in $COLUMNSTORE_CONFIG"
        fi
--- a/build/prepare_test_container.sh
+++ b/build/prepare_test_container.sh
@@ -75,8 +75,7 @@ start_container() {
    fi
 }

-start_container
-
+prepare_container() {
 if [[ "$RESULT" != *rocky* ]]; then
    execInnerDocker "$CONTAINER_NAME" 'sed -i "s/exit 101/exit 0/g" /usr/sbin/policy-rc.d'
 fi
@@ -118,8 +117,16 @@ echo "Installing columnstore..."
 if [[ "$RESULT" == *rocky* ]]; then
    execInnerDockerWithRetry "$CONTAINER_NAME" 'yum install -y MariaDB-columnstore-engine MariaDB-test'
 else
-    execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y mariadb-plugin-columnstore mariadb-test'
+    execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y mariadb-plugin-columnstore mariadb-test mariadb-test-data'
 fi

 sleep 5
 echo "PrepareTestStage completed in $CONTAINER_NAME"
+}
+
+
+if [[ -z $(docker ps -q --filter "name=${CONTAINER_NAME}") ]]; then
+    start_container
+    prepare_container
+else warn "Container ${CONTAINER_NAME} is already running!"
+fi
--- a/build/run_mtr.sh
+++ b/build/run_mtr.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+set -eo pipefail
+
+SCRIPT_LOCATION=$(dirname "$0")
+source "$SCRIPT_LOCATION"/utils.sh
+
+optparse.define short=c long=container-name desc="Name of the Docker container where mtr tests will run" variable=CONTAINER_NAME
+optparse.define short=d long=distro desc="Linux distro for which mtr is runned" variable=DISTRO
+optparse.define short=s long=suite-list desc="Comma-separated list of test suites to run" variable=MTR_SUITE_LIST
+optparse.define short=e long=triggering-event desc="Event that triggers testrun" variable=EVENT
+source $(optparse.build)
+
+MTR_FULL_SET="basic,bugfixes,devregression,autopilot,extended,multinode,oracle,1pmonly"
+
+echo "Arguments received: $@"
+
+if [[ "$EUID" -ne 0 ]]; then
+    error "Please run script as root"
+    exit 1
+fi
+
+if [[ -z "${CONTAINER_NAME}" ]]; then
+    echo "Please provide mtr container name as a parameter, e.g. ./run_mtr.sh -c mtr183"
+    exit 1
+fi
+
+if [[ -z $(docker ps -q --filter "name=${CONTAINER_NAME}") ]]; then
+    error "Container '${CONTAINER_NAME}' is not running."
+    exit 1
+fi
+
+if [[ "$DISTRO" == *rocky* ]]; then
+    SOCKET_PATH="/var/lib/mysql/mysql.sock"
+    MTR_PATH="/usr/share/mysql-test"
+else
+    SOCKET_PATH="/run/mysqld/mysqld.sock"
+    MTR_PATH="/usr/share/mysql/mysql-test"
+fi
+
+message "Running mtr tests..."
+
+execInnerDocker "${CONTAINER_NAME}" "chown -R mysql:mysql ${MTR_PATH}"
+
+# disable systemd 'ProtectSystem' (we need to write to /usr/share/)
+execInnerDocker "${CONTAINER_NAME}" "sed -i /ProtectSystem/d \$(systemctl show --property FragmentPath mariadb | sed s/FragmentPath=//) || true"
+execInnerDocker "${CONTAINER_NAME}" "systemctl daemon-reload"
+execInnerDocker "${CONTAINER_NAME}" "systemctl start mariadb"
+
+# Set RAM consumption limits to avoid RAM contention b/w mtr and regression steps.
+execInnerDocker "${CONTAINER_NAME}" "/usr/bin/mcsSetConfig SystemConfig CGroup just_no_group_use_local"
+execInnerDocker "${CONTAINER_NAME}" "mariadb -e \"create database if not exists test;\""
+execInnerDocker "${CONTAINER_NAME}" "systemctl restart mariadb-columnstore"
+
+if [[ "${EVENT}" == "custom" || "${EVENT}" == "cron" ]]; then
+    execInnerDocker "${CONTAINER_NAME}" "wget -qO- https://cspkg.s3.amazonaws.com/mtr-test-data.tar.lz4 | lz4 -dc - | tar xf - -C /"
+    execInnerDocker "${CONTAINER_NAME}" "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/setup"
+fi
+
+if [[ "${EVENT}" == "cron" ]]; then
+    execInnerDocker "${CONTAINER_NAME}" "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_FULL_SET//,/,columnstore/}"
+else
+    execInnerDocker "${CONTAINER_NAME}" "cd ${MTR_PATH} && ./mtr --extern socket=${SOCKET_PATH} --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/${MTR_SUITE_LIST//,/,columnstore/}"
+fi
--- a/build/run_regression.sh
+++ b/build/run_regression.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+set -o pipefail
+
+SCRIPT_LOCATION=$(dirname "$0")
+source "$SCRIPT_LOCATION"/utils.sh
+
+optparse.define short=c long=container-name     desc="Name of the Docker container where regression tests will run" variable=CONTAINER_NAME
+optparse.define short=b long=regression-branch  desc="Branch from regression tests repo"                            variable=REGRESSION_BRANCH
+optparse.define short=d long=distro             desc="Linux distro for which regression is executed"                variable=DISTRO
+optparse.define short=t long=regression-timeout desc="Timeout for the regression test run"                          variable=REGRESSION_TIMEOUT
+optparse.define short=n long=test-name          desc="Name of regression test to execute"                           variable=TEST_NAME
+source "$(optparse.build)"
+
+for flag in CONTAINER_NAME REGRESSION_BRANCH DISTRO; do
+  if [[ -z "${!flag}" ]]; then
+    error "Missing required flag: -${flag:0:1} / --${flag,,}"
+    exit 1
+  fi
+done
+
+if [[ -z $(docker ps -q --filter "name=${CONTAINER_NAME}") ]]; then
+  error "Container '${CONTAINER_NAME}' is not running."
+  exit 1
+fi
+
+BUILD_DIR="verylongdirnameforverystrangecpackbehavior"
+
+prepare_regression() {
+  if execInnerDocker "${CONTAINER_NAME}" "test -f /mariadb-columnstore-regression-test/mysql/queries/queryTester.cpp"; then
+    return 0
+  fi
+
+  message "Running one-time preparation for regression tests"
+
+  # Set config path prefix based on distro
+  if [[ "$DISTRO" == *rocky* ]]; then
+    CONFIG_PATH_PREFIX="/etc/my.cnf.d/"
+  else
+    CONFIG_PATH_PREFIX="/etc/mysql/mariadb.conf.d/50-"
+  fi
+
+  git clone --recurse-submodules --branch "${REGRESSION_BRANCH}" --depth 1 https://github.com/mariadb-corporation/mariadb-columnstore-regression-test
+  cd mariadb-columnstore-regression-test
+  git rev-parse --abbrev-ref HEAD && git rev-parse HEAD
+  cd ..
+
+  docker cp mariadb-columnstore-regression-test "${CONTAINER_NAME}:/"
+  docker cp "/mdb/${BUILD_DIR}/storage/columnstore/columnstore/storage-manager" "${CONTAINER_NAME}:/"
+
+  #copy test data for regression test suite
+  execInnerDocker "${CONTAINER_NAME}" 'bash -c "wget -qO- https://cspkg.s3.amazonaws.com/testData.tar.lz4 | lz4 -dc - | tar xf - -C mariadb-columnstore-regression-test/"'
+
+  # set mariadb lower_case_table_names=1 config option
+  execInnerDocker "${CONTAINER_NAME}" "sed -i '/^\[mariadb\]/a lower_case_table_names=1' ${CONFIG_PATH_PREFIX}server.cnf"
+
+  # set default client character set to utf-8
+  execInnerDocker "${CONTAINER_NAME}" "sed -i '/^\[client\]/a default-character-set=utf8' ${CONFIG_PATH_PREFIX}client.cnf"
+
+  # Start services and build queryTester
+  execInnerDocker "${CONTAINER_NAME}" "systemctl start mariadb"
+  execInnerDocker "${CONTAINER_NAME}" "systemctl restart mariadb-columnstore"
+  execInnerDocker "${CONTAINER_NAME}" "g++ /mariadb-columnstore-regression-test/mysql/queries/queryTester.cpp -O2 -o /mariadb-columnstore-regression-test/mysql/queries/queryTester"
+
+  message "Regression preparation complete"
+}
+
+run_test() {
+  message "Running test: ${TEST_NAME:-<none>}"
+
+  execInnerDocker "${CONTAINER_NAME}" "bash -c 'sleep 4800 && bash /save_stack.sh /mariadb-columnstore-regression-test/mysql/queries/nightly/alltest/reg-logs/' &"
+
+  execInnerDockerNoTTY "${CONTAINER_NAME}" \
+    "export PRESERVE_LOGS=true && cd /mariadb-columnstore-regression-test/mysql/queries/nightly/alltest && \
+     timeout -k 1m -s SIGKILL --preserve-status ${REGRESSION_TIMEOUT} ./go.sh --sm_unit_test_dir=/storage-manager --tests=${TEST_NAME} \
+       || ./regression_logs.sh ${TEST_NAME}"
+}
+
+on_exit() {
+  exit_code=$?
+  if [[ $exit_code -eq 0 ]]; then
+    message "Regression finished successfully"
+  else
+    message "Some of regression tests has failed"
+  fi
+}
+trap on_exit EXIT
+
+prepare_regression
+run_test
+
--- a/build/utils.sh
+++ b/build/utils.sh
@@ -531,7 +531,20 @@ function execInnerDocker() {

  if [[ $dockerCommandExitCode -ne 0 ]]; then
    error "Command \"$@\" failed in container \"$container_name\""
-    exit $dockerCommandExitCode
+    return $dockerCommandExitCode
+  fi
+}
+
+function execInnerDockerNoTTY() {
+  local container_name=$1
+  shift 1
+
+  docker exec "$container_name" bash -c "$@"
+  local dockerCommandExitCode=$?
+
+  if [[ $dockerCommandExitCode -ne 0 ]]; then
+    error "Command \"$@\" failed in container \"$container_name\""
+    return $dockerCommandExitCode
  fi
 }

--- a/cmapi/cmapi_server/handlers/cluster.py
+++ b/cmapi/cmapi_server/handlers/cluster.py
@@ -83,6 +83,7 @@ class ClusterHandler():
                r_json = r.json()
                if len(r_json.get('services', 0)) == 0:
                    r_json['dbrm_mode'] = 'offline'
+                    r_json['cluster_mode'] = 'offline'

                response[f'{str(node)}'] = r_json
                num_nodes += 1
--- a/dbcon/execplan/calpontselectexecutionplan.cpp
+++ b/dbcon/execplan/calpontselectexecutionplan.cpp
@@ -193,51 +193,71 @@ void CalpontSelectExecutionPlan::havingTokenList(const FilterTokenList& havingTo
    having(parser.parse(tokens.begin(), tokens.end()));
 }

-string CalpontSelectExecutionPlan::toString() const
+std::string endlWithIndent(const size_t ident)
+{
+  ostringstream output;
+  output << endl;
+  output << std::string(ident, ' ');
+  return output.str();
+}
+
+void CalpontSelectExecutionPlan::printSubCSEP(const size_t& ident, ostringstream& output,
+                                           CalpontSelectExecutionPlan*& plan) const
+{
+  if (plan)
+  {
+    output << endlWithIndent(ident) << "{";
+    output << plan->toString(ident + 2);
+    output << endlWithIndent(ident) << "}";
+  }
+}
+string CalpontSelectExecutionPlan::toString(const size_t ident) const
 {
  ostringstream output;

-  output << ">SELECT ";
+  output << endlWithIndent(ident) << "SELECT ";

  if (distinct())
-    output << "DISTINCT ";
+  {
+    output << endlWithIndent(ident) << "DISTINCT ";
+  }

-  output << "limit: " << limitStart() << " - " << limitNum() << endl;
+  output << endlWithIndent(ident) << "limit: " << limitStart() << " - " << limitNum();

  switch (location())
  {
-    case CalpontSelectExecutionPlan::MAIN: output << "MAIN" << endl; break;
+    case CalpontSelectExecutionPlan::MAIN: output << endlWithIndent(ident) << "MAIN"; break;

-    case CalpontSelectExecutionPlan::FROM: output << "FROM" << endl; break;
+    case CalpontSelectExecutionPlan::FROM: output << endlWithIndent(ident) << "FROM"; break;

-    case CalpontSelectExecutionPlan::WHERE: output << "WHERE" << endl; break;
+    case CalpontSelectExecutionPlan::WHERE: output << endlWithIndent(ident) << "WHERE"; break;

-    case CalpontSelectExecutionPlan::HAVING: output << "HAVING" << endl; break;
+    case CalpontSelectExecutionPlan::HAVING: output << "HAVING" << endlWithIndent(ident); break;
  }

  // Returned Column
  CalpontSelectExecutionPlan::ReturnedColumnList retCols = returnedCols();
-  output << ">>Returned Columns" << endl;
+  output << endlWithIndent(ident) << ">>Returned Columns";
+
  uint32_t seq = 0;

  for (unsigned int i = 0; i < retCols.size(); i++)
  {
-    output << *retCols[i] << endl;
+    output << endlWithIndent(ident+2) << *retCols[i]; // WIP replace with constant

    if (retCols[i]->colSource() & SELECT_SUB)
    {
-      output << "select sub -- " << endl;
+      output << endlWithIndent(ident + 2) << "select sub -- ";
      CalpontSelectExecutionPlan* plan =
          dynamic_cast<CalpontSelectExecutionPlan*>(fSelectSubList[seq++].get());

-      if (plan)
-        output << "{" << *plan << "}" << endl;
+      printSubCSEP(ident + 2, output, plan);
    }
  }

  // From Clause
  CalpontSelectExecutionPlan::TableList tables = tableList();
-  output << ">>From Tables" << endl;
+  output << endlWithIndent(ident) <<">>From Tables";
  seq = 0;

  for (unsigned int i = 0; i < tables.size(); i++)
@@ -245,42 +265,50 @@ string CalpontSelectExecutionPlan::toString() const
    // derived table
    if (tables[i].schema.length() == 0 && tables[i].table.length() == 0)
    {
-      output << "derived table - " << tables[i].alias << endl;
+      output << endlWithIndent(ident+2) << "derived table - " << tables[i].alias;
      CalpontSelectExecutionPlan* plan =
          dynamic_cast<CalpontSelectExecutionPlan*>(fDerivedTableList[seq++].get());

-      if (plan)
-        output << "{" << *plan << "}" << endl;
+      printSubCSEP(ident + 2, output, plan);
    }
    else
    {
-      output << tables[i] << endl;
+      output << endlWithIndent(ident+2) << tables[i];
    }
  }

  // Filters
-  output << ">>Filters" << endl;
+  output << endlWithIndent(ident) << ">>Filters";

  if (filters() != nullptr)
+  {
+    output << endlWithIndent(ident + 2);
    filters()->walk(ParseTree::print, output);
+  }
  else
-    output << "empty filter tree" << endl;
+  {
+    output << endlWithIndent(ident + 2) << "empty filter tree";
+  }

  // Group by columns
  const CalpontSelectExecutionPlan::GroupByColumnList& gbc = groupByCols();

  if (gbc.size() > 0)
  {
-    output << ">>Group By Columns" << endl;
+    output << endlWithIndent(ident) << ">>Group By Columns";
+    output << std::string(ident, ' ');

    for (unsigned int i = 0; i < gbc.size(); i++)
-      output << *gbc[i] << endl;
+    {
+      output << endlWithIndent(ident + 2) << *gbc[i];
+    }
+    output << std::string(ident, ' ');
  }

  // Having
  if (having() != nullptr)
  {
-    output << ">>Having" << endl;
+    output << endlWithIndent(ident) << ">>Having" << endlWithIndent(ident + 2);
    having()->walk(ParseTree::print, output);
  }

@@ -289,39 +317,42 @@ string CalpontSelectExecutionPlan::toString() const

  if (obc.size() > 0)
  {
-    output << ">>Order By Columns" << endl;
+    output << endlWithIndent(ident) << ">>Order By Columns";

    for (unsigned int i = 0; i < obc.size(); i++)
-      output << *obc[i] << endl;
+      output << endlWithIndent(ident + 2) << *obc[i];
  }

-  output << "SessionID: " << fSessionID << endl;
-  output << "TxnID: " << fTxnID << endl;
-  output << "VerID: " << fVerID << endl;
-  output << "TraceFlags: " << fTraceFlags << endl;
-  output << "StatementID: " << fStatementID << endl;
-  output << "DistUnionNum: " << (int)fDistinctUnionNum << endl;
-  output << "Limit: " << fLimitStart << " - " << fLimitNum << endl;
-  output << "String table threshold: " << fStringTableThreshold << endl;
+  output << endlWithIndent(ident) << "SessionID: " << fSessionID;
+  output << endlWithIndent(ident) << "TxnID: " << fTxnID;
+  output << endlWithIndent(ident) << "VerID: " << fVerID;
+  output << endlWithIndent(ident) << "TraceFlags: " << fTraceFlags;
+  output << endlWithIndent(ident) << "StatementID: " << fStatementID;
+  output << endlWithIndent(ident) << "DistUnionNum: " << (int)fDistinctUnionNum;
+  output << endlWithIndent(ident) << "Limit: " << fLimitStart << " - " << fLimitNum;
+  output << endlWithIndent(ident) << "String table threshold: " << fStringTableThreshold;

-  output << "--- Column Map ---" << endl;
+  output << endlWithIndent(ident) << "--- Column Map ---";
  CalpontSelectExecutionPlan::ColumnMap::const_iterator iter;

  for (iter = columnMap().begin(); iter != columnMap().end(); iter++)
-    output << (*iter).first << " : " << (*iter).second << endl;
+  {
+    output << endlWithIndent(ident + 2) << (*iter).first << " : " << (*iter).second;
+  }

-  output << "UUID: " << fUuid << endl;
-  output << "QueryType: " << queryType() << endl;
+  output << endlWithIndent(ident) << "UUID: " << fUuid;
+  output << endlWithIndent(ident) << "QueryType: " << queryType();

  if (!unionVec().empty())
-    output << "\n--- Union Unit ---" << endl;
+  {
+    output << endlWithIndent(ident) << "--- Union Unit ---";
+  }

  for (unsigned i = 0; i < unionVec().size(); i++)
  {
    CalpontSelectExecutionPlan* plan = dynamic_cast<CalpontSelectExecutionPlan*>(unionVec()[i].get());

-    if (plan)
-      output << "{" << *plan << "}\n" << endl;
+    printSubCSEP(ident, output, plan);
  }

  return output.str();
@@ -832,4 +863,107 @@ void CalpontSelectExecutionPlan::pron(std::string&& pron)
  fPron = pron;
 }

+// This routine doesn't copy derived table list, union vector, select subqueries, subquery list, and subselects.
+execplan::SCSEP CalpontSelectExecutionPlan::cloneWORecursiveSelects()
+{
+  execplan::SCSEP newPlan(new CalpontSelectExecutionPlan(fLocation));
+  
+  // Copy simple members
+  newPlan->fLocalQuery = fLocalQuery;
+  newPlan->fTableAlias = fTableAlias;
+  newPlan->fLocation = fLocation;
+  newPlan->fDependent = fDependent;
+  newPlan->fData = fData;
+  newPlan->fSessionID = fSessionID;
+  newPlan->fTxnID = fTxnID;
+  newPlan->fVerID = fVerID;
+  newPlan->fSchemaName = fSchemaName;
+  newPlan->fTableName = fTableName;
+  newPlan->fTraceFlags = fTraceFlags;
+  newPlan->fStatementID = fStatementID;
+  newPlan->fDistinct = fDistinct;
+  newPlan->fOverrideLargeSideEstimate = fOverrideLargeSideEstimate;
+  newPlan->fDistinctUnionNum = fDistinctUnionNum;
+  newPlan->fSubType = fSubType;
+  newPlan->fDerivedTbAlias = fDerivedTbAlias;
+  newPlan->fDerivedTbView = fDerivedTbView;
+  newPlan->fLimitStart = fLimitStart;
+  newPlan->fLimitNum = fLimitNum;
+  newPlan->fHasOrderBy = fHasOrderBy;
+  newPlan->fStringScanThreshold = fStringScanThreshold;
+  newPlan->fQueryType = fQueryType;
+  newPlan->fPriority = fPriority;
+  newPlan->fStringTableThreshold = fStringTableThreshold;
+  newPlan->fSpecHandlerProcessed = fSpecHandlerProcessed;
+  newPlan->fOrderByThreads = fOrderByThreads;
+  newPlan->fUuid = fUuid;
+  newPlan->fDJSSmallSideLimit = fDJSSmallSideLimit;
+  newPlan->fDJSLargeSideLimit = fDJSLargeSideLimit;
+  newPlan->fDJSPartitionSize = fDJSPartitionSize;
+  newPlan->fDJSMaxPartitionTreeDepth = fDJSMaxPartitionTreeDepth;
+  newPlan->fDJSForceRun = fDJSForceRun;
+  newPlan->fMaxPmJoinResultCount = fMaxPmJoinResultCount;
+  newPlan->fUMMemLimit = fUMMemLimit;
+  newPlan->fIsDML = fIsDML;
+  newPlan->fTimeZone = fTimeZone;
+  newPlan->fPron = fPron;
+  newPlan->fWithRollup = fWithRollup;
+  
+  // Deep copy of ReturnedColumnList
+  ReturnedColumnList newReturnedCols;
+  for (const auto& col : fReturnedCols)
+  {
+    if (col)
+      newReturnedCols.push_back(SRCP(col->clone()));
+  }
+  newPlan->returnedCols(newReturnedCols);
+  
+  // Deep copy of filters
+  if (fFilters)
+    newPlan->filters(new ParseTree(*fFilters));
+  
+  // Deep copy of filter token list
+  newPlan->filterTokenList(fFilterTokenList);
+  newPlan->havingTokenList(fHavingTokenList);
+  
+  // Deep copy of group by columns
+  GroupByColumnList newGroupByCols;
+  for (const auto& col : fGroupByCols)
+  {
+    if (col)
+      newGroupByCols.push_back(SRCP(col->clone()));
+  }
+  newPlan->groupByCols(newGroupByCols);
+  
+  // Deep copy of having clause
+  if (fHaving)
+    newPlan->having(new ParseTree(*fHaving));
+  
+  // Deep copy of order by columns
+  OrderByColumnList newOrderByCols;
+  for (const auto& col : fOrderByCols)
+  {
+    if (col)
+      newOrderByCols.push_back(SRCP(col->clone()));
+  }
+  newPlan->orderByCols(newOrderByCols);
+  
+  // Deep copy of column map
+  ColumnMap newColumnMap;
+  for (const auto& entry : fColumnMap)
+  {
+    if (entry.second)
+      newColumnMap.insert(ColumnMap::value_type(entry.first, SRCP(entry.second->clone())));
+  }
+  newPlan->columnMap(newColumnMap);
+  
+  // Copy RM parameters
+  newPlan->rmParms(frmParms);
+  
+  // Deep copy of table list
+  newPlan->tableList(fTableList);
+  
+  return newPlan;
+}
+
 }  // namespace execplan
--- a/dbcon/execplan/calpontselectexecutionplan.h
+++ b/dbcon/execplan/calpontselectexecutionplan.h
@@ -159,6 +159,10 @@ class CalpontSelectExecutionPlan : public CalpontExecutionPlan
   */
  ~CalpontSelectExecutionPlan() override;

+  /**
+   * Clones this CSEP without recursive selects for optimizer purposes
+   */
+  execplan::SCSEP cloneWORecursiveSelects();
  /**
   * Access and mutator methods
   */
@@ -797,7 +801,8 @@ class CalpontSelectExecutionPlan : public CalpontExecutionPlan
   * Return a string rep of the CSEP
   * @return a string
   */
-  virtual std::string toString() const;
+  void printSubCSEP(const size_t& ident, ostringstream& output, CalpontSelectExecutionPlan*& plan) const;
+  virtual std::string toString(const size_t ident = 0) const;

  /** @brief Is this an internal query?
   *
--- a/dbcon/execplan/calpontsystemcatalog.h
+++ b/dbcon/execplan/calpontsystemcatalog.h
@@ -458,8 +458,13 @@ class CalpontSystemCatalog : public datatypes::SystemCatalog
    {
      return !(*this == rhs);
    }
+    bool isColumnstore() const 
+    {
+      return fisColumnStore;
+    }
    void serialize(messageqcpp::ByteStream&) const;
    void unserialize(messageqcpp::ByteStream&);
+
    friend std::ostream& operator<<(std::ostream& os, const TableAliasName& rhs);
  };

--- a/dbcon/joblist/subquerytransformer.cpp
+++ b/dbcon/joblist/subquerytransformer.cpp
@@ -79,9 +79,6 @@ SubQueryTransformer::~SubQueryTransformer()
 SJSTEP& SubQueryTransformer::makeSubQueryStep(execplan::CalpontSelectExecutionPlan* csep,
                                              bool subInFromClause)
 {
-  if (fOutJobInfo->trace)
-    cout << (*csep) << endl;
-
    // Setup job info, job list and error status relation.
  fSubJobInfo = new JobInfo(fOutJobInfo->rm);
  fSubJobInfo->sessionId = fOutJobInfo->sessionId;
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -23,6 +23,8 @@ set(libcalmysql_SRCS
    ha_mcs_impl.cpp
    ha_mcs_dml.cpp
    ha_mcs_ddl.cpp
+    ha_mcs_execplan_helpers.cpp
+    ha_mcs_execplan_walks.cpp
    ha_mcs_execplan.cpp
    ha_scalar_sub.cpp
    ha_in_sub.cpp
@@ -40,6 +42,7 @@ set(libcalmysql_SRCS
    is_columnstore_files.cpp
    is_columnstore_extents.cpp
    columnstore_dataload.cpp
+    rulebased_optimizer.cpp
 )

 set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-templates")
--- a/dbcon/mysql/ha_mcs.cpp
+++ b/dbcon/mysql/ha_mcs.cpp
@@ -1828,14 +1828,20 @@ static int columnstore_init_func(void* p)
  fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", columnstore_version.c_str(),
          columnstore_release.c_str());

+  plugin_ref plugin_innodb;
  LEX_CSTRING name = {STRING_WITH_LEN("INNODB")};
-  auto* plugin_innodb = ha_resolve_by_name(0, &name, 0);
-  if (!plugin_innodb || plugin_state(plugin_innodb) != PLUGIN_IS_READY)

+  if (get_innodb_queries_uses_mcs())
  {
-    DBUG_RETURN(HA_ERR_RETRY_INIT);
-  }
+    std::cerr << "Columnstore: innodb_queries_uses_mcs is set, looking for InnoDB plugin." << std::endl;

+    plugin_innodb = ha_resolve_by_name(0, &name, 0);
+    if (!plugin_innodb || plugin_state(plugin_innodb) != PLUGIN_IS_READY)
+    {
+      DBUG_RETURN(HA_ERR_RETRY_INIT);
+    }
+  }
+  
  strncpy(cs_version, columnstore_version.c_str(), sizeof(cs_version) - 1);
  cs_version[sizeof(cs_version) - 1] = 0;

@@ -1844,10 +1850,14 @@ static int columnstore_init_func(void* p)

  mcs_hton = (handlerton*)p;

+  std::cerr << "Columnstore: init pthread_mutex_init" << std::endl;
  (void)pthread_mutex_init(&mcs_mutex, MY_MUTEX_INIT_FAST);
+  std::cerr << "Columnstore: init my_hash_init" << std::endl;
  (void)my_hash_init(PSI_NOT_INSTRUMENTED, &mcs_open_tables, system_charset_info, 32, 0, 0,
                     (my_hash_get_key)mcs_get_key, 0, 0);

+  std::cerr << "Columnstore: init mcs_hton attributes" << std::endl;
+  
  mcs_hton->create = ha_mcs_cache_create_handler;
  mcs_hton->panic = 0;
  mcs_hton->flags = HTON_CAN_RECREATE | HTON_NO_PARTITION;
@@ -1863,10 +1873,13 @@ static int columnstore_init_func(void* p)

  if (get_innodb_queries_uses_mcs())
  {
+    std::cerr << "Columnstore: innodb_queries_uses_mcs is set, redirecting all InnoDB queries to Columnstore." << std::endl;
+
    auto* innodb_hton = plugin_hton(plugin_innodb);
    int error = innodb_hton == nullptr;  // Engine must exists!
    if (error)
    {
+      std::cerr << "Columnstore: innodb_queries_uses_mcs is set, but could not find InnoDB plugin." << std::endl;
      my_error(HA_ERR_INITIALIZATION, MYF(0), "Could not find storage engine %s", name.str);
    }
    innodb_hton->create_select = create_columnstore_select_handler;
@@ -1874,11 +1887,13 @@ static int columnstore_init_func(void* p)
  }

 #ifdef HAVE_PSI_INTERFACE
+  std::cerr << "Columnstore: Registering mutex for Columnstore write cache." << std::endl;
  uint count = sizeof(all_mutexes) / sizeof(all_mutexes[0]);
  mysql_mutex_register("ha_mcs_cache", all_mutexes, count);
 #else
  (void)key_LOCK_cache_share;
 #endif
+  std::cerr << "Columnstore: Initialising mutex for Columnstore write cache." << std::endl;
  mysql_mutex_init(key_LOCK_cache_share, &LOCK_cache_share, MY_MUTEX_INIT_FAST);

  DBUG_RETURN(0);
--- a/dbcon/mysql/ha_mcs_execplan.cpp
+++ b/dbcon/mysql/ha_mcs_execplan.cpp
--- a/dbcon/mysql/ha_mcs_execplan_helpers.cpp
+++ b/dbcon/mysql/ha_mcs_execplan_helpers.cpp
@@ -0,0 +1,189 @@
+/* Copyright (C) 2025 MariaDB Corporation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+
+#include "ha_mcs_execplan_helpers.h"
+#include "constantcolumn.h"
+
+namespace cal_impl_if
+{
+bool nonConstFunc(Item_func* ifp)
+{
+  if (strcasecmp(ifp->func_name(), "rand") == 0 || strcasecmp(ifp->func_name(), "sysdate") == 0 ||
+      strcasecmp(ifp->func_name(), "idblocalpm") == 0)
+    return true;
+
+  for (uint32_t i = 0; i < ifp->argument_count(); i++)
+  {
+    if (ifp->arguments()[i]->type() == Item::FUNC_ITEM && nonConstFunc(((Item_func*)ifp->arguments()[i])))
+      return true;
+  }
+
+  return false;
+}
+
+/*
+  Create a ConstantColumn according to cmp_type().
+  But do not set the time zone yet.
+
+  Handles NULL and NOT NULL values.
+
+  Uses a simplified logic regarding to data types:
+    always extracts the value through val_str().
+
+  Should probably be joined with the previous function, to have
+  a single function which can at the same time:
+  a. handle both NULL and NOT NULL values
+  b. extract values using a native val_xxx() method,
+     to avoid possible negative effects mentioned in the comments
+     to newConstantColumnNotNullUsingValNativeNoTz().
+*/
+execplan::ConstantColumn* newConstantColumnMaybeNullFromValStrNoTz(const Item* item,
+                                                                          const ValStrStdString& valStr,
+                                                                          gp_walk_info& gwi)
+{
+  if (valStr.isNull())
+    return new execplan::ConstantColumnNull();
+
+  switch (item->result_type())
+  {
+    case STRING_RESULT: return new execplan::ConstantColumnString(valStr);
+    case DECIMAL_RESULT: return buildDecimalColumn(item, valStr, gwi);
+    case TIME_RESULT:
+    case INT_RESULT:
+    case REAL_RESULT:
+    case ROW_RESULT: return new execplan::ConstantColumnNum(colType_MysqlToIDB(item), valStr);
+  }
+  return nullptr;
+}
+
+// Create a ConstantColumn from a previously evaluated val_str() result,
+// Supports both NULL and NOT NULL values.
+// Sets the time zone according to gwi.
+execplan::ConstantColumn* buildConstantColumnMaybeNullFromValStr(const Item* item, const ValStrStdString& valStr,
+                                                              gp_walk_info& gwi)
+{
+  execplan::ConstantColumn* rc = newConstantColumnMaybeNullFromValStrNoTz(item, valStr, gwi);
+  if (rc)
+    rc->timeZone(gwi.timeZone);
+  return rc;
+}
+
+// Create a ConstantColumn by calling val_str().
+// Supports both NULL and NOT NULL values.
+// Sets the time zone according to gwi.
+
+execplan::ConstantColumn* buildConstantColumnMaybeNullUsingValStr(Item* item, gp_walk_info& gwi)
+{
+  return buildConstantColumnMaybeNullFromValStr(item, ValStrStdString(item), gwi);
+}
+
+// Create a ConstantColumn for a NOT NULL expression.
+// Sets the time zone according to gwi.
+execplan::ConstantColumn* buildConstantColumnNotNullUsingValNative(Item* item, gp_walk_info& gwi)
+{
+  execplan::ConstantColumn* rc = newConstantColumnNotNullUsingValNativeNoTz(item, gwi);
+  if (rc)
+    rc->timeZone(gwi.timeZone);
+  return rc;
+}
+
+/*
+  Create a ConstantColumn according to cmp_type().
+  But do not set the time zone yet.
+
+  Handles NOT NULL values.
+
+  Three ways of value extraction are used depending on the data type:
+  1. Using a native val_xxx().
+  2. Using val_str() with further convertion to the native representation.
+  3. Using both val_str() and a native val_xxx().
+
+  We should eventually get rid of N2 and N3 and use N1 for all data types:
+  - N2 contains a redundant code for str->native conversion.
+    It should be replaced to an existing code (a Type_handler method call?).
+  - N3 performs double evalation of the value, which may cause
+    various negative effects (double side effects or double warnings).
+*/
+execplan::ConstantColumn* newConstantColumnNotNullUsingValNativeNoTz(Item* item, gp_walk_info& gwi)
+{
+  DBUG_ASSERT(item->const_item());
+
+  switch (item->cmp_type())
+  {
+    case INT_RESULT:
+    {
+      if (item->unsigned_flag)
+        return new execplan::ConstantColumnUInt((uint64_t)item->val_uint(), (int8_t)item->decimal_scale(),
+                                      (uint8_t)item->decimal_precision());
+      ValStrStdString str(item);
+      DBUG_ASSERT(!str.isNull());
+      return new execplan::ConstantColumnSInt(colType_MysqlToIDB(item), str, (int64_t)item->val_int());
+    }
+    case STRING_RESULT:
+    {
+      // Special handling for 0xHHHH literals
+      if (item->type_handler() == &type_handler_hex_hybrid)
+        return new execplan::ConstantColumn((int64_t)item->val_int(), execplan::ConstantColumn::NUM);
+      ValStrStdString str(item);
+      DBUG_ASSERT(!str.isNull());
+      return new execplan::ConstantColumnString(str);
+    }
+    case REAL_RESULT:
+    {
+      ValStrStdString str(item);
+      DBUG_ASSERT(!str.isNull());
+      return new execplan::ConstantColumnReal(colType_MysqlToIDB(item), str, item->val_real());
+    }
+    case DECIMAL_RESULT:
+    {
+      ValStrStdString str(item);
+      DBUG_ASSERT(!str.isNull());
+      return buildDecimalColumn(item, str, gwi);
+    }
+    case TIME_RESULT:
+    {
+      ValStrStdString str(item);
+      DBUG_ASSERT(!str.isNull());
+      return new execplan::ConstantColumnTemporal(colType_MysqlToIDB(item), str);
+    }
+    default:
+    {
+      gwi.fatalParseError = true;
+      gwi.parseErrorText = "Unknown item type";
+      break;
+    }
+  }
+
+  return nullptr;
+}
+
+bool isSupportedAggregateWithOneConstArg(const Item_sum* item, Item** orig_args)
+{
+  if (item->argument_count() != 1 || !orig_args[0]->const_item())
+    return false;
+  switch (orig_args[0]->cmp_type())
+  {
+    case INT_RESULT:
+    case STRING_RESULT:
+    case REAL_RESULT:
+    case DECIMAL_RESULT: return true;
+    default: break;
+  }
+  return false;
+}
+
+}  // namespace cal_impl_if
--- a/dbcon/mysql/ha_mcs_execplan_helpers.h
+++ b/dbcon/mysql/ha_mcs_execplan_helpers.h
@@ -0,0 +1,58 @@
+/* Copyright (C) 2025 MariaDB Corporation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+
+#pragma once
+
+
+#define PREFER_MY_CONFIG_H
+#include <my_config.h>
+#include "idb_mysql.h"
+
+#include "constantcolumn.h"
+#include "ha_mcs_impl_if.h"
+
+namespace cal_impl_if
+{
+
+class ValStrStdString : public std::string
+{
+  bool mIsNull;
+
+  public:
+  ValStrStdString(Item* item)
+  {
+    String val, *str = item->val_str(&val);
+    mIsNull = (str == nullptr);
+    DBUG_ASSERT(mIsNull == item->null_value);
+    if (!mIsNull)
+      assign(str->ptr(), str->length());
+  }
+  bool isNull() const
+  {
+    return mIsNull;
+  }
+};
+  
+bool nonConstFunc(Item_func* ifp);
+// Note: This function might be unused currently but is kept for future compatibility.
+execplan::ConstantColumn* buildConstantColumnMaybeNullFromValStr(const Item* item, const ValStrStdString& valStr,
+  cal_impl_if::gp_walk_info& gwi);
+execplan::ConstantColumn* newConstantColumnNotNullUsingValNativeNoTz(Item* item, gp_walk_info& gwi);
+bool isSupportedAggregateWithOneConstArg(const Item_sum* item, Item** orig_args);
+execplan::ConstantColumn* buildConstantColumnNotNullUsingValNative(Item* item, gp_walk_info& gwi);
+execplan::ConstantColumn* buildConstantColumnMaybeNullUsingValStr(Item* item, gp_walk_info& gwi);
+}
--- a/dbcon/mysql/ha_mcs_execplan_parseinfo_bits.h
+++ b/dbcon/mysql/ha_mcs_execplan_parseinfo_bits.h
@@ -0,0 +1,28 @@
+/* Copyright (C) 2025 MariaDB Corporation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+
+#pragma once
+
+#include <cstdint>
+
+namespace cal_impl_if
+{
+  const uint64_t AGG_BIT = 0x01;
+  const uint64_t SUB_BIT = 0x02;
+  const uint64_t AF_BIT = 0x04;
+  const uint64_t CORRELATED = 0x08;
+}
--- a/dbcon/mysql/ha_mcs_execplan_walks.cpp
+++ b/dbcon/mysql/ha_mcs_execplan_walks.cpp
--- a/dbcon/mysql/ha_mcs_execplan_walks.h
+++ b/dbcon/mysql/ha_mcs_execplan_walks.h
@@ -0,0 +1,28 @@
+/* Copyright (C) 2025 MariaDB Corporation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+
+#pragma once
+
+#define PREFER_MY_CONFIG_H
+#include <my_config.h>
+#include "idb_mysql.h"
+
+namespace cal_impl_if 
+{
+void debug_walk(const Item* item, void* arg);
+void gp_walk(const Item* item, void* arg);
+}
--- a/dbcon/mysql/ha_mcs_impl.cpp
+++ b/dbcon/mysql/ha_mcs_impl.cpp
@@ -4248,19 +4248,6 @@ int ha_mcs_impl_pushdown_init(mcs_handler_info* handler_info, TABLE* table, bool
      ifs.close();
      csep->unserialize(bs1);
 #endif
-
-      if (ci->traceFlags & 1)
-      {
-        cerr << "---------------- EXECUTION PLAN ----------------" << endl;
-        cerr << *csep << endl;
-        cerr << "-------------- EXECUTION PLAN END --------------\n" << endl;
-      }
-      else
-      {
-        IDEBUG(cout << "---------------- EXECUTION PLAN ----------------" << endl);
-        IDEBUG(cerr << *csep << endl);
-        IDEBUG(cout << "-------------- EXECUTION PLAN END --------------\n" << endl);
-      }
    }
  }  // end of execution plan generation

--- a/dbcon/mysql/ha_mcs_sysvars.cpp
+++ b/dbcon/mysql/ha_mcs_sysvars.cpp
@@ -224,7 +224,9 @@ static my_bool innodb_queries_use_mcs;
 static MYSQL_SYSVAR_BOOL(innodb_queries_use_mcs, innodb_queries_use_mcs,
                      PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
                      "Direct all InnoDB-only queries into MCS via Select Handler.", NULL, NULL, FALSE);
-    
+static MYSQL_THDVAR_BOOL(unstable_optimizer, PLUGIN_VAR_RQCMDARG,
+                        "Apply optimizer rules after translation from SELECT_LEX/UNION", NULL, NULL, FALSE);
+                        
 st_mysql_sys_var* mcs_system_variables[] = {
    MYSQL_SYSVAR(compression_type),
    MYSQL_SYSVAR(fe_conn_info_ptr),
@@ -267,6 +269,7 @@ st_mysql_sys_var* mcs_system_variables[] = {
    MYSQL_SYSVAR(pron),
    MYSQL_SYSVAR(max_allowed_in_values),
    MYSQL_SYSVAR(innodb_queries_use_mcs),
+    MYSQL_SYSVAR(unstable_optimizer),
    NULL};

 st_mysql_show_var mcs_status_variables[] = {{"columnstore_version", (char*)&cs_version, SHOW_CHAR},
@@ -663,6 +666,15 @@ void set_max_allowed_in_values(THD* thd, ulong value)
  THDVAR(thd, max_allowed_in_values) = value;
 }

+bool get_unstable_optimizer(THD* thd)
+{
+  return (thd == NULL) ? 0 : THDVAR(thd, unstable_optimizer);
+}
+void set_unstable_optimizer(THD* thd, bool value)
+{
+  THDVAR(thd, unstable_optimizer) = value;
+}
+
 bool get_innodb_queries_uses_mcs()
 {
  return SYSVAR(innodb_queries_use_mcs);
--- a/dbcon/mysql/ha_mcs_sysvars.h
+++ b/dbcon/mysql/ha_mcs_sysvars.h
@@ -175,4 +175,7 @@ const char* get_pron(THD* thd);
 void set_pron(THD* thd, char* value);

 ulong get_max_allowed_in_values(THD* thd);
-void set_max_allowed_in_values(THD* thd, ulong value);
+void set_max_allowed_in_values(THD* thd, ulong value);
+
+bool get_unstable_optimizer(THD* thd);
+void set_unstable_optimizer(THD* thd, bool value);
--- a/dbcon/mysql/rulebased_optimizer.cpp
+++ b/dbcon/mysql/rulebased_optimizer.cpp
@@ -0,0 +1,252 @@
+/* Copyright (C) 2025 MariaDB Corporation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+
+#include "constantcolumn.h"
+#include "execplan/calpontselectexecutionplan.h"
+#include "execplan/simplecolumn.h"
+#include "logicoperator.h"
+#include "operator.h"
+#include "predicateoperator.h"
+#include "simplefilter.h"
+#include "rulebased_optimizer.h"
+
+namespace optimizer
+{
+
+static const std::string RewrittenSubTableAliasPrefix = "$added_sub_";
+
+// Apply a list of rules to a CSEP
+bool optimizeCSEPWithRules(execplan::CalpontSelectExecutionPlan& root, const std::vector<Rule>& rules)
+{
+  bool changed = false;
+  for (const auto& rule : rules)
+  {
+    changed |= rule.apply(root);
+  }
+  return changed;
+}
+
+// high level API call for optimizer
+bool optimizeCSEP(execplan::CalpontSelectExecutionPlan& root)
+{
+  optimizer::Rule parallelCES{"parallelCES", optimizer::matchParallelCES, optimizer::applyParallelCES};
+
+  std::vector<Rule> rules = {parallelCES};
+
+  return optimizeCSEPWithRules(root, rules);
+}
+
+// Apply iteratively until CSEP is converged by rule
+bool Rule::apply(execplan::CalpontSelectExecutionPlan& root) const
+{
+  bool changedThisRound = false;
+  bool hasBeenApplied = false;
+  do
+  {
+    changedThisRound = walk(root);
+    hasBeenApplied |= changedThisRound;
+  } while (changedThisRound && !applyOnlyOnce);
+
+  return hasBeenApplied;
+}
+
+// DFS walk to match CSEP and apply rules if match
+bool Rule::walk(execplan::CalpontSelectExecutionPlan& csep) const
+{
+  bool rewrite = false;
+
+  for (auto& table : csep.derivedTableList())
+  {
+    auto* csepPtr = dynamic_cast<execplan::CalpontSelectExecutionPlan*>(table.get());
+    if (!csepPtr)
+    {
+      continue;
+    }
+
+    auto& csepLocal = *csepPtr;
+    rewrite |= walk(csepLocal);
+  }
+
+  for (auto& unionUnit : csep.unionVec())
+  {
+    auto* unionUnitPtr = dynamic_cast<execplan::CalpontSelectExecutionPlan*>(unionUnit.get());
+    if (!unionUnitPtr)
+    {
+      continue;
+    }
+
+    auto& unionUnitLocal = *unionUnitPtr;
+    rewrite |= walk(unionUnitLocal);
+  }
+
+  if (matchRule(csep))
+  {
+    applyRule(csep);
+    rewrite = true;
+  }
+
+  return rewrite;
+}
+
+bool tableIsInUnion(const execplan::CalpontSystemCatalog::TableAliasName& table,
+                    execplan::CalpontSelectExecutionPlan& csep)
+{
+  return std::any_of(csep.unionVec().begin(), csep.unionVec().end(),
+                     [&table](const auto& unionUnit)
+                     {
+                       execplan::CalpontSelectExecutionPlan* unionUnitLocal =
+                           dynamic_cast<execplan::CalpontSelectExecutionPlan*>(unionUnit.get());
+                       bool tableIsPresented =
+                           std::any_of(unionUnitLocal->tableList().begin(), unionUnitLocal->tableList().end(),
+                                       [&table](const auto& unionTable) { return unionTable == table; });
+                       return tableIsPresented;
+                     });
+}
+
+bool matchParallelCES(execplan::CalpontSelectExecutionPlan& csep)
+{
+  auto tables = csep.tableList();
+  // This is leaf and there are no other tables at this level in neither UNION, nor derived table.
+  // WIP filter out CSEPs with orderBy, groupBy, having
+  // Filter out tables that were re-written.
+  return tables.size() == 1 && !tables[0].isColumnstore() && !tableIsInUnion(tables[0], csep);
+}
+
+// This routine produces a new ParseTree that is AND(lowerBand <= column, column <= upperBand)
+// TODO add engine-independent statistics-derived ranges
+execplan::ParseTree* filtersWithNewRangeAddedIfNeeded(execplan::SCSEP& csep)
+{
+  // INV this is SimpleColumn we supply as an argument
+  // TODO find the suitable column using EI statistics.
+  auto* column = dynamic_cast<execplan::SimpleColumn*>(csep->returnedCols().front().get());
+  assert(column);
+
+  auto tableKeyColumnLeftOp = new execplan::SimpleColumn(*column);
+  tableKeyColumnLeftOp->resultType(column->resultType());
+
+  // TODO Nobody owns this allocation and cleanup only depends on delete in ParseTree nodes' dtors.
+  auto* filterColLeftOp = new execplan::ConstantColumnUInt(42ULL, 0, 0);
+  // set TZ
+  // There is a question with ownership of the const column
+  execplan::SOP ltOp = boost::make_shared<execplan::Operator>(execplan::PredicateOperator("<="));
+  ltOp->setOpType(filterColLeftOp->resultType(), tableKeyColumnLeftOp->resultType());
+  ltOp->resultType(ltOp->operationType());
+
+  auto* sfr = new execplan::SimpleFilter(ltOp, tableKeyColumnLeftOp, filterColLeftOp);
+  // auto tableKeyColumn = derivedSCEP->returnedCols().front();
+  auto tableKeyColumnRightOp = new execplan::SimpleColumn(*column);
+  tableKeyColumnRightOp->resultType(column->resultType());
+  // TODO hardcoded column type and value
+  auto* filterColRightOp = new execplan::ConstantColumnUInt(30ULL, 0, 0);
+
+  execplan::SOP gtOp = boost::make_shared<execplan::Operator>(execplan::PredicateOperator(">="));
+  gtOp->setOpType(filterColRightOp->resultType(), tableKeyColumnRightOp->resultType());
+  gtOp->resultType(gtOp->operationType());
+
+  auto* sfl = new execplan::SimpleFilter(gtOp, tableKeyColumnRightOp, filterColRightOp);
+
+  execplan::ParseTree* ptp = new execplan::ParseTree(new execplan::LogicOperator("and"));
+  ptp->right(sfr);
+  ptp->left(sfl);
+
+  auto* currentFilters = csep->filters();
+  if (currentFilters)
+  {
+    execplan::ParseTree* andWithExistingFilters =
+        new execplan::ParseTree(new execplan::LogicOperator("and"), currentFilters, ptp);
+    return andWithExistingFilters;
+  }
+
+  return ptp;
+}
+
+execplan::CalpontSelectExecutionPlan::SelectList makeUnionFromTable(
+    const size_t numberOfLegs, execplan::CalpontSelectExecutionPlan& csep)
+{
+  execplan::CalpontSelectExecutionPlan::SelectList unionVec;
+  unionVec.reserve(numberOfLegs);
+  for (size_t i = 0; i < numberOfLegs; ++i)
+  {
+    auto clonedCSEP = csep.cloneWORecursiveSelects();
+    // Add BETWEEN based on key column range
+    clonedCSEP->filters(filtersWithNewRangeAddedIfNeeded(clonedCSEP));
+    unionVec.push_back(clonedCSEP);
+  }
+
+  return unionVec;
+}
+
+void applyParallelCES(execplan::CalpontSelectExecutionPlan& csep)
+{
+  auto tables = csep.tableList();
+  execplan::CalpontSelectExecutionPlan::TableList newTableList;
+  execplan::CalpontSelectExecutionPlan::SelectList newDerivedTableList;
+  execplan::CalpontSelectExecutionPlan::ReturnedColumnList newReturnedColumns;
+
+  // ATM Must be only 1 table
+  for (auto& table : tables)
+  {
+    if (!table.isColumnstore())
+    {
+      auto derivedSCEP = csep.cloneWORecursiveSelects();
+      // need to add a level here
+      std::string tableAlias = RewrittenSubTableAliasPrefix + table.schema + "_" + table.table;
+
+      derivedSCEP->location(execplan::CalpontSelectExecutionPlan::FROM);
+      derivedSCEP->subType(execplan::CalpontSelectExecutionPlan::FROM_SUBS);
+      derivedSCEP->derivedTbAlias(tableAlias);
+
+      // TODO: hardcoded for now
+      size_t parallelFactor = 2;
+      // Create a copy of the current leaf CSEP with additional filters to partition the key column
+      auto additionalUnionVec = makeUnionFromTable(parallelFactor, csep);
+      derivedSCEP->unionVec().insert(derivedSCEP->unionVec().end(), additionalUnionVec.begin(),
+                                     additionalUnionVec.end());
+
+      size_t colPosition = 0;
+      // change parent to derived table columns
+      for (auto& rc : csep.returnedCols())
+      {
+        auto rcCloned = boost::make_shared<execplan::SimpleColumn>(*rc);
+        // TODO timezone and result type are not copied
+        // TODO add specific ctor for this functionality
+        rcCloned->tableName("");
+        rcCloned->schemaName("");
+        rcCloned->tableAlias(tableAlias);
+        rcCloned->colPosition(colPosition++);
+        rcCloned->resultType(rc->resultType());
+
+        newReturnedColumns.push_back(rcCloned);
+      }
+
+      newDerivedTableList.push_back(derivedSCEP);
+      execplan::CalpontSystemCatalog::TableAliasName tn = execplan::make_aliasview("", "", tableAlias, "");
+      newTableList.push_back(tn);
+     // Remove the filters as they were pushed down to union units
+      derivedSCEP->filters(nullptr);
+    }
+  }
+  // Remove the filters as they were pushed down to union units
+  csep.filters(nullptr);
+  // There must be no derived at this point.
+  csep.derivedTableList(newDerivedTableList);
+  // Replace table list with new table list populated with union units
+  csep.tableList(newTableList);
+  csep.returnedCols(newReturnedColumns);
+}
+
+}  // namespace optimizer
--- a/dbcon/mysql/rulebased_optimizer.h
+++ b/dbcon/mysql/rulebased_optimizer.h
@@ -0,0 +1,53 @@
+/* Copyright (C) 2025 MariaDB Corporation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+
+#pragma once
+
+#include <string>
+#include "execplan/calpontselectexecutionplan.h"
+
+namespace optimizer {
+
+struct Rule
+{
+  using RuleMatcher = bool (*)(execplan::CalpontSelectExecutionPlan&);
+  using RuleApplier = void (*)(execplan::CalpontSelectExecutionPlan&);
+
+  Rule(std::string&& name, RuleMatcher matchRule, RuleApplier applyRule)
+   : name(name), matchRule(matchRule), applyRule(applyRule) {};
+
+  std::string name;
+  RuleMatcher matchRule;
+  RuleApplier applyRule;
+  // TODO Wrap CSEP into Nodes to be able to navigate up and down the tree and remove this flag
+  bool applyOnlyOnce = true;
+
+  Rule() = default;
+  Rule(const Rule&) = default;
+  Rule(Rule&&) = default;
+  Rule& operator=(const Rule&) = default;
+  Rule& operator=(Rule&&) = default;
+
+  bool apply(execplan::CalpontSelectExecutionPlan& csep) const;
+  bool walk(execplan::CalpontSelectExecutionPlan& csep) const;
+};
+
+bool matchParallelCES(execplan::CalpontSelectExecutionPlan& csep);
+void applyParallelCES(execplan::CalpontSelectExecutionPlan& csep);
+bool optimizeCSEP(execplan::CalpontSelectExecutionPlan& root);
+
+}
--- a/mysql-test/columnstore/1pmonly/t/mcol4652-cpimport-sets-wide-decimals-ranges.test
+++ b/mysql-test/columnstore/1pmonly/t/mcol4652-cpimport-sets-wide-decimals-ranges.test
@@ -1,4 +1,5 @@
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcol4652;
--- a/mysql-test/columnstore/1pmonly/t/mcs201_calshowpartitions_function.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs201_calshowpartitions_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs201_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs202_caldisablepartitions_function.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs202_caldisablepartitions_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs202_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs203_calenablepartitions_function.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs203_calenablepartitions_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs203_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs204_caldroppartitions_function.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs204_caldroppartitions_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs204_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs208_idbPartition_function.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs208_idbPartition_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs208_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs209_idbDBRoot_function.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs209_idbDBRoot_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs209_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs210_idbPm_function.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs210_idbPm_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs210_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs214_idbExtentRelativeRid_function.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs214_idbExtentRelativeRid_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs214_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs215_idbSegment_function.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs215_idbSegment_function.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc

 --disable_warnings
 DROP DATABASE IF EXISTS mcs215_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs4009_autopilot_partition_management.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs4009_autopilot_partition_management.test
@@ -4,6 +4,7 @@
 # Author: Daniel Lee, daniel.lee@mariadb.com
 # -------------------------------------------------------------- #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4009_db;
--- a/mysql-test/columnstore/1pmonly/t/mcs7000_version_buffer.test
+++ b/mysql-test/columnstore/1pmonly/t/mcs7000_version_buffer.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs7000_db;
--- a/mysql-test/columnstore/autopilot/r/mcs4125_function_CNX_LAST_DAY_DS_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4125_function_CNX_LAST_DAY_DS_maxscale.result
@@ -0,0 +1,25 @@
+USE autopilot;
+select cidx, CDATE, LAST_DAY(CDATE) from datatypetestm order by cidx;
+cidx	CDATE	LAST_DAY(CDATE)
+1	1997-01-01	1997-01-31
+select cidx, CDATETIME, LAST_DAY(CDATETIME) from datatypetestm order by cidx;
+cidx	CDATETIME	LAST_DAY(CDATETIME)
+1	1997-01-01 00:00:00	1997-01-31
+select cidx, CTIME, LAST_DAY(CTIME) from datatypetestm order by cidx;
+cidx	CTIME	LAST_DAY(CTIME)
+1	13:00:00	REPLACEDVALUE
+select cidx, LAST_DAY('2009-02-28') from datatypetestm order by cidx;
+cidx	LAST_DAY('2009-02-28')
+1	2009-02-28
+select cidx, LAST_DAY('2009-07-04') from datatypetestm order by cidx;
+cidx	LAST_DAY('2009-07-04')
+1	2009-07-31
+select cidx, LAST_DAY('2010-02-31') from datatypetestm order by cidx;
+cidx	LAST_DAY('2010-02-31')
+1	NULL
+select cidx, CDATE from datatypetestm where LAST_DAY(CDATE) <> 0 order by cidx;
+cidx	CDATE
+1	1997-01-01
+select cidx, CDATETIME from datatypetestm where LAST_DAY(CDATETIME) <> 0 order by cidx;
+cidx	CDATETIME
+1	1997-01-01 00:00:00
--- a/mysql-test/columnstore/autopilot/r/mcs4154_function_CNX_MICROSECOND_DS_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4154_function_CNX_MICROSECOND_DS_maxscale.result
@@ -0,0 +1,22 @@
+USE autopilot;
+select cidx, CDATE, MICROSECOND(CDATE) from datatypetestm order by cidx;
+cidx	CDATE	MICROSECOND(CDATE)
+1	1997-01-01	0
+select cidx, CDATETIME, MICROSECOND(CDATETIME) from datatypetestm order by cidx;
+cidx	CDATETIME	MICROSECOND(CDATETIME)
+1	1997-01-01 00:00:00	0
+select cidx, CTIME, MICROSECOND(CTIME) from datatypetestm order by cidx;
+cidx	CTIME	MICROSECOND(CTIME)
+1	13:00:00	0
+select cidx, MICROSECOND('2011-05-01') from datatypetestm order by cidx;
+cidx	MICROSECOND('2011-05-01')
+1	0
+select cidx, MICROSECOND('2011-05-01 13:58:22.123456') from datatypetestm order by cidx;
+cidx	MICROSECOND('2011-05-01 13:58:22.123456')
+1	123456
+select cidx, CDATE from datatypetestm where MICROSECOND(CDATE) <> 0 order by cidx;
+cidx	CDATE
+select cidx, CDATETIME from datatypetestm where MICROSECOND(CDATETIME) <> 0 order by cidx;
+cidx	CDATETIME
+select cidx, CTIME from datatypetestm where MICROSECOND(CTIME) <> 0 order by cidx;
+cidx	CTIME
--- a/mysql-test/columnstore/autopilot/r/mcs4162_function_CNX_MONTHNAME_DS_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4162_function_CNX_MONTHNAME_DS_maxscale.result
@@ -0,0 +1,23 @@
+USE autopilot;
+select cidx, CDATE, MONTHNAME(CDATE) from datatypetestm order by cidx;
+cidx	CDATE	MONTHNAME(CDATE)
+1	1997-01-01	January
+select cidx, CDATETIME, MONTHNAME(CDATETIME) from datatypetestm order by cidx;
+cidx	CDATETIME	MONTHNAME(CDATETIME)
+1	1997-01-01 00:00:00	January
+select cidx, CTIME, MONTHNAME(CTIME) from datatypetestm order by cidx;
+cidx	CTIME	MONTHNAME(CTIME)
+1	13:00:00	REPLACEDVALUE
+select cidx, MONTHNAME('2009-02-28') from datatypetestm order by cidx;
+cidx	MONTHNAME('2009-02-28')
+1	February
+select cidx, MONTHNAME('2009-07-04') from datatypetestm order by cidx;
+cidx	MONTHNAME('2009-07-04')
+1	July
+select cidx, MONTHNAME('2010-02-31') from datatypetestm order by cidx;
+cidx	MONTHNAME('2010-02-31')
+1	NULL
+select cidx, CDATE from datatypetestm where MONTHNAME(CDATE) <> 0 order by cidx;
+cidx	CDATE
+select cidx, CDATETIME from datatypetestm where MONTHNAME(CDATETIME) <> 0 order by cidx;
+cidx	CDATETIME
--- a/mysql-test/columnstore/autopilot/r/mcs4164_function_CNX_NULLIF_NM_Archived_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4164_function_CNX_NULLIF_NM_Archived_maxscale.result
@@ -0,0 +1,897 @@
+USE autopilot;
+select cidx, CBIGINT, NULLIF(CBIGINT,CBIGINT) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CBIGINT)
+1	-72036854775806	NULL
+select cidx, CBIGINT, NULLIF(CBIGINT,CINTEGER) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CINTEGER)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,CDOUBLE) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CDOUBLE)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CDECIMAL9_2)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,1) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,1)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,3.14) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,3.14)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,CCHAR4) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CCHAR4)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,CDATE) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CDATE)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,NULL) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,NULL)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,'HELLO WORLD')
+1	-72036854775806	-72036854775806
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CBIGINT)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CINTEGER)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CDOUBLE)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CDECIMAL9_2)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,1) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,1)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,3.14)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CCHAR4)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CDATE)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,NULL)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,'HELLO WORLD')
+1	-9	-9
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CBIGINT)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CINTEGER)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CDOUBLE)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CDECIMAL9_2)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,1) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,1)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,3.14)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CCHAR4)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CDATE)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,NULL)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,'HELLO WORLD')
+1	-999	-999
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CBIGINT)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CINTEGER)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CDOUBLE)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CDECIMAL9_2)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,1) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,1)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,3.14)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CCHAR4)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CDATE)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,NULL)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,'HELLO WORLD')
+1	-9.99	-9.99
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CBIGINT)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CINTEGER)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CDOUBLE)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CDECIMAL9_2)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,1) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,1)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,3.14)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CCHAR4)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CDATE)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,NULL)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,'HELLO WORLD')
+1	-999	-999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CBIGINT)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CINTEGER)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CDOUBLE)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CDECIMAL9_2)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,1) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,1)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,3.14)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CCHAR4)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CDATE)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,NULL)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,'HELLO WORLD')
+1	-999999	-999999
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CBIGINT)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CINTEGER)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CDOUBLE)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CDECIMAL9_2)
+1	-9999.99	NULL
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,1) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,1)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,3.14)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CCHAR4)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CDATE)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,NULL)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,'HELLO WORLD')
+1	-9999.99	-9999.99
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CBIGINT)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CINTEGER)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CDOUBLE)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CDECIMAL9_2)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,1) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,1)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,3.14)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CCHAR4)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CDATE)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,NULL)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,'HELLO WORLD')
+1	-9999999	-9999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CBIGINT)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CINTEGER)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CDOUBLE)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CDECIMAL9_2)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,1) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,1)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,3.14)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CCHAR4)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CDATE)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,NULL)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,'HELLO WORLD')
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CBIGINT)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CINTEGER)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CDOUBLE)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CDECIMAL9_2)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,1) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,1)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,3.14)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CCHAR4)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CDATE)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,NULL)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,'HELLO WORLD')
+1	-99999999999.99	-99999999999.99
+select cidx, CINTEGER, NULLIF(CINTEGER,CBIGINT) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CBIGINT)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,CINTEGER) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CINTEGER)
+1	-7483646	NULL
+select cidx, CINTEGER, NULLIF(CINTEGER,CDOUBLE) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CDOUBLE)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CDECIMAL9_2)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,1) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,1)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,3.14) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,3.14)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,CCHAR4) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CCHAR4)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,CDATE) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CDATE)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,NULL) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,NULL)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,'HELLO WORLD')
+1	-7483646	-7483646
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CBIGINT) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CBIGINT)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CINTEGER) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CINTEGER)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDOUBLE) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CDOUBLE)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CDECIMAL9_2)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,1) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,1)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,3.14) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,3.14)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CCHAR4) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CCHAR4)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDATE) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CDATE)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,NULL) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,NULL)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,'HELLO WORLD')
+1	-766	-766
+select cidx, CTINYINT, NULLIF(CTINYINT,CBIGINT) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CBIGINT)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CINTEGER) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CINTEGER)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CDOUBLE) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CDOUBLE)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CDECIMAL9_2)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,1) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,1)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,3.14) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,3.14)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CCHAR4) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CCHAR4)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CDATE) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CDATE)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,NULL) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,NULL)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,'HELLO WORLD')
+1	-26	-26
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CBIGINT) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CBIGINT)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CINTEGER) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CINTEGER)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CDOUBLE)
+1	-1.797693231e108	NULL
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CDECIMAL9_2)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,1) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,1)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,3.14) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,3.14)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CCHAR4) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CCHAR4)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDATE) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CDATE)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,NULL) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,NULL)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,'HELLO WORLD')
+1	-1.797693231e108	-1.797693231e108
+select cidx, CFLOAT, NULLIF(CFLOAT,CBIGINT) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CBIGINT)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CINTEGER) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CINTEGER)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CDOUBLE) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CDOUBLE)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CDECIMAL9_2)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,1) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,1)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,3.14) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,3.14)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CCHAR4) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CCHAR4)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CDATE) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CDATE)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,NULL) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,NULL)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,'HELLO WORLD')
+1	-3.40287e18	-3.40287e18
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CBIGINT) <> 0 order by cidx;
+cidx	CBIGINT
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CINTEGER) <> 0 order by cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CDOUBLE) <> 0 order by cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,1) <> 0 order by cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,3.14) <> 0 order by cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CCHAR4) <> 0 order by cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CDATE) <> 0 order by cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,NULL) <> 0 order by cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,'HELLO WORLD') <> 0 order by cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CBIGINT) <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CINTEGER) <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CDOUBLE) <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,1) <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,3.14) <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CCHAR4) <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CDATE) <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,NULL) <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CBIGINT) <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CINTEGER) <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CDOUBLE) <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,1) <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,3.14) <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CCHAR4) <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CDATE) <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,NULL) <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CBIGINT) <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CINTEGER) <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CDOUBLE) <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,1) <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,3.14) <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CCHAR4) <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CDATE) <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,NULL) <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CBIGINT) <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CINTEGER) <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CDOUBLE) <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,1) <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,3.14) <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CCHAR4) <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CDATE) <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,NULL) <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CBIGINT) <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CINTEGER) <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CDOUBLE) <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,1) <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,3.14) <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CCHAR4) <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CDATE) <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,NULL) <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CBIGINT) <> 0 order by cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CINTEGER) <> 0 order by cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CDOUBLE) <> 0 order by cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDECIMAL9_2
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,1) <> 0 order by cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,3.14) <> 0 order by cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CCHAR4) <> 0 order by cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CDATE) <> 0 order by cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,NULL) <> 0 order by cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CBIGINT) <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CINTEGER) <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CDOUBLE) <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,1) <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,3.14) <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CCHAR4) <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CDATE) <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,NULL) <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CBIGINT) <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CINTEGER) <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CDOUBLE) <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,1) <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,3.14) <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CCHAR4) <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CDATE) <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,NULL) <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CBIGINT) <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CINTEGER) <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CDOUBLE) <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,1) <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,3.14) <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CCHAR4) <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CDATE) <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,NULL) <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CBIGINT) <> 0 order by cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CINTEGER) <> 0 order by cidx;
+cidx	CINTEGER
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CDOUBLE) <> 0 order by cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,1) <> 0 order by cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,3.14) <> 0 order by cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CCHAR4) <> 0 order by cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CDATE) <> 0 order by cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,NULL) <> 0 order by cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,'HELLO WORLD') <> 0 order by cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CBIGINT) <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CINTEGER) <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CDOUBLE) <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,1) <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,3.14) <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CCHAR4) <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CDATE) <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,NULL) <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,'HELLO WORLD') <> 0 order by cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CBIGINT) <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CINTEGER) <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CDOUBLE) <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,1) <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,3.14) <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CCHAR4) <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CDATE) <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,NULL) <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,'HELLO WORLD') <> 0 order by cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CBIGINT) <> 0 order by cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CINTEGER) <> 0 order by cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CDOUBLE) <> 0 order by cidx;
+cidx	CDOUBLE
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,1) <> 0 order by cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,3.14) <> 0 order by cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CCHAR4) <> 0 order by cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CDATE) <> 0 order by cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,NULL) <> 0 order by cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,'HELLO WORLD') <> 0 order by cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CBIGINT) <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CINTEGER) <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CDOUBLE) <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CDECIMAL9_2) <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,1) <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,3.14) <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CCHAR4) <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CDATE) <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,NULL) <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,'HELLO WORLD') <> 0 order by cidx;
+cidx	CFLOAT
+1	-3.40287e18
--- a/mysql-test/columnstore/autopilot/r/mcs4220_function_CNX_TIME_TO_SEC_DS_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4220_function_CNX_TIME_TO_SEC_DS_maxscale.result
@@ -0,0 +1,26 @@
+USE autopilot;
+select cidx, CDATE, TIME_TO_SEC(CDATE) from datatypetestm order by cidx;
+cidx	CDATE	TIME_TO_SEC(CDATE)
+1	1997-01-01	0
+select cidx, CDATETIME, TIME_TO_SEC(CDATETIME) from datatypetestm order by cidx;
+cidx	CDATETIME	TIME_TO_SEC(CDATETIME)
+1	1997-01-01 00:00:00	0
+select cidx, CTIME, TIME_TO_SEC(CTIME) from datatypetestm order by cidx;
+cidx	CTIME	TIME_TO_SEC(CTIME)
+1	13:00:00	46800
+select cidx, TIME_TO_SEC('22:23:00') from datatypetestm order by cidx;
+cidx	TIME_TO_SEC('22:23:00')
+1	80580
+select cidx, TIME_TO_SEC('00:39:38') from datatypetestm order by cidx;
+cidx	TIME_TO_SEC('00:39:38')
+1	2378
+select cidx, TIME_TO_SEC('22:23:49 999999') from datatypetestm order by cidx;
+cidx	TIME_TO_SEC('22:23:49 999999')
+1	NULL
+select cidx, CDATE from datatypetestm where TIME_TO_SEC(CDATE) <> 0 order by cidx;
+cidx	CDATE
+select cidx, CDATETIME from datatypetestm where TIME_TO_SEC(CDATETIME) <> 0 order by cidx;
+cidx	CDATETIME
+select cidx, CTIME from datatypetestm where TIME_TO_SEC(CTIME) <> 0 order by cidx;
+cidx	CTIME
+1	13:00:00
--- a/mysql-test/columnstore/autopilot/r/mcs4350_function_CNXPP_LAST_DAY_DS_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4350_function_CNXPP_LAST_DAY_DS_maxscale.result
@@ -0,0 +1,25 @@
+USE autopilot;
+select cidx, CDATE, LAST_DAY(CDATE) from datatypetestm order by cidx;
+cidx	CDATE	LAST_DAY(CDATE)
+1	1997-01-01	1997-01-31
+select cidx, CDATETIME, LAST_DAY(CDATETIME) from datatypetestm order by cidx;
+cidx	CDATETIME	LAST_DAY(CDATETIME)
+1	1997-01-01 00:00:00	1997-01-31
+select cidx, CTIME, LAST_DAY(CTIME) from datatypetestm order by cidx;
+cidx	CTIME	LAST_DAY(CTIME)
+1	13:00:00	REPLACEDVALUE
+select cidx, LAST_DAY('2009-02-28') from datatypetestm order by cidx;
+cidx	LAST_DAY('2009-02-28')
+1	2009-02-28
+select cidx, LAST_DAY('2009-07-04') from datatypetestm order by cidx;
+cidx	LAST_DAY('2009-07-04')
+1	2009-07-31
+select cidx, LAST_DAY('2010-02-31') from datatypetestm order by cidx;
+cidx	LAST_DAY('2010-02-31')
+1	NULL
+select cidx, CDATE from datatypetestm order by LAST_DAY(CDATE), cidx;
+cidx	CDATE
+1	1997-01-01
+select cidx, CDATETIME from datatypetestm order by LAST_DAY(CDATETIME), cidx;
+cidx	CDATETIME
+1	1997-01-01 00:00:00
--- a/mysql-test/columnstore/autopilot/r/mcs4379_function_CNXPP_MICROSECOND_DS_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4379_function_CNXPP_MICROSECOND_DS_maxscale.result
@@ -0,0 +1,25 @@
+USE autopilot;
+select cidx, CDATE, MICROSECOND(CDATE) from datatypetestm order by cidx;
+cidx	CDATE	MICROSECOND(CDATE)
+1	1997-01-01	0
+select cidx, CDATETIME, MICROSECOND(CDATETIME) from datatypetestm order by cidx;
+cidx	CDATETIME	MICROSECOND(CDATETIME)
+1	1997-01-01 00:00:00	0
+select cidx, CTIME, MICROSECOND(CTIME) from datatypetestm order by cidx;
+cidx	CTIME	MICROSECOND(CTIME)
+1	13:00:00	0
+select cidx, MICROSECOND('2011-05-01') from datatypetestm order by cidx;
+cidx	MICROSECOND('2011-05-01')
+1	0
+select cidx, MICROSECOND('2011-05-01 13:58:22.123456') from datatypetestm order by cidx;
+cidx	MICROSECOND('2011-05-01 13:58:22.123456')
+1	123456
+select cidx, CDATE from datatypetestm order by MICROSECOND(CDATE), cidx;
+cidx	CDATE
+1	1997-01-01
+select cidx, CDATETIME from datatypetestm order by MICROSECOND(CDATETIME), cidx;
+cidx	CDATETIME
+1	1997-01-01 00:00:00
+select cidx, CTIME from datatypetestm order by MICROSECOND(CTIME), cidx;
+cidx	CTIME
+1	13:00:00
--- a/mysql-test/columnstore/autopilot/r/mcs4387_function_CNXPP_MONTHNAME_DS_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4387_function_CNXPP_MONTHNAME_DS_maxscale.result
@@ -0,0 +1,25 @@
+USE autopilot;
+select cidx, CDATE, MONTHNAME(CDATE) from datatypetestm order by cidx;
+cidx	CDATE	MONTHNAME(CDATE)
+1	1997-01-01	January
+select cidx, CDATETIME, MONTHNAME(CDATETIME) from datatypetestm order by cidx;
+cidx	CDATETIME	MONTHNAME(CDATETIME)
+1	1997-01-01 00:00:00	January
+select cidx, CTIME, MONTHNAME(CTIME) from datatypetestm order by cidx;
+cidx	CTIME	MONTHNAME(CTIME)
+1	13:00:00	REPLACEDVALUE
+select cidx, MONTHNAME('2009-02-28') from datatypetestm order by cidx;
+cidx	MONTHNAME('2009-02-28')
+1	February
+select cidx, MONTHNAME('2009-07-04') from datatypetestm order by cidx;
+cidx	MONTHNAME('2009-07-04')
+1	July
+select cidx, MONTHNAME('2010-02-31') from datatypetestm order by cidx;
+cidx	MONTHNAME('2010-02-31')
+1	NULL
+select cidx, CDATE from datatypetestm order by MONTHNAME(CDATE), cidx;
+cidx	CDATE
+1	1997-01-01
+select cidx, CDATETIME from datatypetestm order by MONTHNAME(CDATETIME), cidx;
+cidx	CDATETIME
+1	1997-01-01 00:00:00
--- a/mysql-test/columnstore/autopilot/r/mcs4389_function_CNXPP_NULLIF_NM_Archived_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4389_function_CNXPP_NULLIF_NM_Archived_maxscale.result
@@ -0,0 +1,901 @@
+USE autopilot;
+select cidx, CBIGINT, NULLIF(CBIGINT,CBIGINT) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CBIGINT)
+1	-72036854775806	NULL
+select cidx, CBIGINT, NULLIF(CBIGINT,CINTEGER) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CINTEGER)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,CDOUBLE) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CDOUBLE)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CDECIMAL9_2)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,1) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,1)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,3.14) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,3.14)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,CCHAR4) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CCHAR4)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,CDATE) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,CDATE)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,NULL) from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,NULL)
+1	-72036854775806	-72036854775806
+select cidx, CBIGINT, NULLIF(CBIGINT,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CBIGINT	NULLIF(CBIGINT,'HELLO WORLD')
+1	-72036854775806	-72036854775806
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CBIGINT)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CINTEGER)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CDOUBLE)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CDECIMAL9_2)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,1) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,1)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,3.14)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CCHAR4)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,CDATE)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,NULL)
+1	-9	-9
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL1	NULLIF(CDECIMAL1,'HELLO WORLD')
+1	-9	-9
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CBIGINT)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CINTEGER)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CDOUBLE)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CDECIMAL9_2)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,1) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,1)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,3.14)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CCHAR4)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,CDATE)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,NULL)
+1	-999	-999
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL4	NULLIF(CDECIMAL4,'HELLO WORLD')
+1	-999	-999
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CBIGINT)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CINTEGER)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CDOUBLE)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CDECIMAL9_2)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,1) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,1)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,3.14)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CCHAR4)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,CDATE)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,NULL)
+1	-9.99	-9.99
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL4_2	NULLIF(CDECIMAL4_2,'HELLO WORLD')
+1	-9.99	-9.99
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CBIGINT)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CINTEGER)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CDOUBLE)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CDECIMAL9_2)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,1) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,1)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,3.14)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CCHAR4)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,CDATE)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,NULL)
+1	-999	-999
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL5	NULLIF(CDECIMAL5,'HELLO WORLD')
+1	-999	-999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CBIGINT)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CINTEGER)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CDOUBLE)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CDECIMAL9_2)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,1) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,1)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,3.14)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CCHAR4)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,CDATE)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,NULL)
+1	-999999	-999999
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL9	NULLIF(CDECIMAL9,'HELLO WORLD')
+1	-999999	-999999
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CBIGINT)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CINTEGER)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CDOUBLE)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CDECIMAL9_2)
+1	-9999.99	NULL
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,1) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,1)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,3.14)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CCHAR4)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,CDATE)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,NULL)
+1	-9999.99	-9999.99
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL9_2	NULLIF(CDECIMAL9_2,'HELLO WORLD')
+1	-9999.99	-9999.99
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CBIGINT)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CINTEGER)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CDOUBLE)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CDECIMAL9_2)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,1) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,1)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,3.14)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CCHAR4)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,CDATE)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,NULL)
+1	-9999999	-9999999
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL10	NULLIF(CDECIMAL10,'HELLO WORLD')
+1	-9999999	-9999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CBIGINT)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CINTEGER)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CDOUBLE)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CDECIMAL9_2)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,1) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,1)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,3.14)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CCHAR4)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,CDATE)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,NULL)
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL18	NULLIF(CDECIMAL18,'HELLO WORLD')
+1	-9999999999999	-9999999999999
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CBIGINT) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CBIGINT)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CINTEGER) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CINTEGER)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CDOUBLE)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CDECIMAL9_2)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,1) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,1)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,3.14) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,3.14)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CCHAR4) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CCHAR4)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDATE) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,CDATE)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,NULL) from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,NULL)
+1	-99999999999.99	-99999999999.99
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDECIMAL18_2	NULLIF(CDECIMAL18_2,'HELLO WORLD')
+1	-99999999999.99	-99999999999.99
+select cidx, CINTEGER, NULLIF(CINTEGER,CBIGINT) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CBIGINT)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,CINTEGER) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CINTEGER)
+1	-7483646	NULL
+select cidx, CINTEGER, NULLIF(CINTEGER,CDOUBLE) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CDOUBLE)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CDECIMAL9_2)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,1) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,1)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,3.14) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,3.14)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,CCHAR4) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CCHAR4)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,CDATE) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,CDATE)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,NULL) from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,NULL)
+1	-7483646	-7483646
+select cidx, CINTEGER, NULLIF(CINTEGER,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CINTEGER	NULLIF(CINTEGER,'HELLO WORLD')
+1	-7483646	-7483646
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CBIGINT) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CBIGINT)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CINTEGER) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CINTEGER)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDOUBLE) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CDOUBLE)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CDECIMAL9_2)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,1) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,1)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,3.14) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,3.14)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CCHAR4) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CCHAR4)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDATE) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,CDATE)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,NULL) from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,NULL)
+1	-766	-766
+select cidx, CSMALLINT, NULLIF(CSMALLINT,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CSMALLINT	NULLIF(CSMALLINT,'HELLO WORLD')
+1	-766	-766
+select cidx, CTINYINT, NULLIF(CTINYINT,CBIGINT) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CBIGINT)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CINTEGER) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CINTEGER)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CDOUBLE) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CDOUBLE)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CDECIMAL9_2)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,1) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,1)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,3.14) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,3.14)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CCHAR4) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CCHAR4)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,CDATE) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,CDATE)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,NULL) from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,NULL)
+1	-26	-26
+select cidx, CTINYINT, NULLIF(CTINYINT,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CTINYINT	NULLIF(CTINYINT,'HELLO WORLD')
+1	-26	-26
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CBIGINT) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CBIGINT)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CINTEGER) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CINTEGER)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDOUBLE) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CDOUBLE)
+1	-1.797693231e108	NULL
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CDECIMAL9_2)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,1) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,1)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,3.14) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,3.14)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CCHAR4) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CCHAR4)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDATE) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,CDATE)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,NULL) from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,NULL)
+1	-1.797693231e108	-1.797693231e108
+select cidx, CDOUBLE, NULLIF(CDOUBLE,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CDOUBLE	NULLIF(CDOUBLE,'HELLO WORLD')
+1	-1.797693231e108	-1.797693231e108
+select cidx, CFLOAT, NULLIF(CFLOAT,CBIGINT) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CBIGINT)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CINTEGER) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CINTEGER)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CDOUBLE) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CDOUBLE)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CDECIMAL9_2) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CDECIMAL9_2)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,1) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,1)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,3.14) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,3.14)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CCHAR4) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CCHAR4)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,CDATE) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,CDATE)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,NULL) from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,NULL)
+1	-3.40287e18	-3.40287e18
+select cidx, CFLOAT, NULLIF(CFLOAT,'HELLO WORLD') from datatypetestm order by cidx;
+cidx	CFLOAT	NULLIF(CFLOAT,'HELLO WORLD')
+1	-3.40287e18	-3.40287e18
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CBIGINT), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CINTEGER), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CDOUBLE), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CDECIMAL9_2), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,1), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,3.14), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CCHAR4), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CDATE), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,NULL), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,'HELLO WORLD'), cidx;
+cidx	CBIGINT
+1	-72036854775806
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CBIGINT), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CINTEGER), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CDOUBLE), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CDECIMAL9_2), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,1), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,3.14), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CCHAR4), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CDATE), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,NULL), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,'HELLO WORLD'), cidx;
+cidx	CDECIMAL1
+1	-9
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CBIGINT), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CINTEGER), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CDOUBLE), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CDECIMAL9_2), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,1), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,3.14), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CCHAR4), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CDATE), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,NULL), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,'HELLO WORLD'), cidx;
+cidx	CDECIMAL4
+1	-999
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CBIGINT), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CINTEGER), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CDOUBLE), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CDECIMAL9_2), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,1), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,3.14), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CCHAR4), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CDATE), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,NULL), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,'HELLO WORLD'), cidx;
+cidx	CDECIMAL4_2
+1	-9.99
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CBIGINT), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CINTEGER), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CDOUBLE), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CDECIMAL9_2), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,1), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,3.14), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CCHAR4), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CDATE), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,NULL), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,'HELLO WORLD'), cidx;
+cidx	CDECIMAL5
+1	-999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CBIGINT), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CINTEGER), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CDOUBLE), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CDECIMAL9_2), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,1), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,3.14), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CCHAR4), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CDATE), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,NULL), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,'HELLO WORLD'), cidx;
+cidx	CDECIMAL9
+1	-999999
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CBIGINT), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CINTEGER), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CDOUBLE), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CDECIMAL9_2), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,1), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,3.14), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CCHAR4), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CDATE), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,NULL), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,'HELLO WORLD'), cidx;
+cidx	CDECIMAL9_2
+1	-9999.99
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CBIGINT), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CINTEGER), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CDOUBLE), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CDECIMAL9_2), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,1), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,3.14), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CCHAR4), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CDATE), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,NULL), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,'HELLO WORLD'), cidx;
+cidx	CDECIMAL10
+1	-9999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CBIGINT), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CINTEGER), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CDOUBLE), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CDECIMAL9_2), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,1), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,3.14), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CCHAR4), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CDATE), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,NULL), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,'HELLO WORLD'), cidx;
+cidx	CDECIMAL18
+1	-9999999999999
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CBIGINT), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CINTEGER), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CDOUBLE), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CDECIMAL9_2), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,1), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,3.14), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CCHAR4), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CDATE), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,NULL), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,'HELLO WORLD'), cidx;
+cidx	CDECIMAL18_2
+1	-99999999999.99
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CBIGINT), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CINTEGER), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CDOUBLE), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CDECIMAL9_2), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,1), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,3.14), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CCHAR4), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CDATE), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,NULL), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,'HELLO WORLD'), cidx;
+cidx	CINTEGER
+1	-7483646
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CBIGINT), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CINTEGER), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CDOUBLE), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CDECIMAL9_2), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,1), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,3.14), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CCHAR4), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CDATE), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,NULL), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,'HELLO WORLD'), cidx;
+cidx	CSMALLINT
+1	-766
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CBIGINT), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CINTEGER), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CDOUBLE), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CDECIMAL9_2), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,1), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,3.14), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CCHAR4), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CDATE), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,NULL), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,'HELLO WORLD'), cidx;
+cidx	CTINYINT
+1	-26
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CBIGINT), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CINTEGER), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CDOUBLE), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CDECIMAL9_2), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,1), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,3.14), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CCHAR4), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CDATE), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,NULL), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,'HELLO WORLD'), cidx;
+cidx	CDOUBLE
+1	-1.797693231e108
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CBIGINT), cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CINTEGER), cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CDOUBLE), cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CDECIMAL9_2), cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,1), cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,3.14), cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CCHAR4), cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CDATE), cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,NULL), cidx;
+cidx	CFLOAT
+1	-3.40287e18
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,'HELLO WORLD'), cidx;
+cidx	CFLOAT
+1	-3.40287e18
--- a/mysql-test/columnstore/autopilot/r/mcs4445_function_CNXPP_TIME_TO_SEC_DS_maxscale.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4445_function_CNXPP_TIME_TO_SEC_DS_maxscale.result
@@ -0,0 +1,28 @@
+USE autopilot;
+select cidx, CDATE, TIME_TO_SEC(CDATE) from datatypetestm order by cidx;
+cidx	CDATE	TIME_TO_SEC(CDATE)
+1	1997-01-01	0
+select cidx, CDATETIME, TIME_TO_SEC(CDATETIME) from datatypetestm order by cidx;
+cidx	CDATETIME	TIME_TO_SEC(CDATETIME)
+1	1997-01-01 00:00:00	0
+select cidx, CTIME, TIME_TO_SEC(CTIME) from datatypetestm order by cidx;
+cidx	CTIME	TIME_TO_SEC(CTIME)
+1	13:00:00	46800
+select cidx, TIME_TO_SEC('22:23:00') from datatypetestm order by cidx;
+cidx	TIME_TO_SEC('22:23:00')
+1	80580
+select cidx, TIME_TO_SEC('00:39:38') from datatypetestm order by cidx;
+cidx	TIME_TO_SEC('00:39:38')
+1	2378
+select cidx, TIME_TO_SEC('22:23:49 999999') from datatypetestm order by cidx;
+cidx	TIME_TO_SEC('22:23:49 999999')
+1	NULL
+select cidx, CDATE from datatypetestm order by TIME_TO_SEC(CDATE), cidx;
+cidx	CDATE
+1	1997-01-01
+select cidx, CDATETIME from datatypetestm order by TIME_TO_SEC(CDATETIME), cidx;
+cidx	CDATETIME
+1	1997-01-01 00:00:00
+select cidx, CTIME from datatypetestm order by TIME_TO_SEC(CTIME), cidx;
+cidx	CTIME
+1	13:00:00
--- a/mysql-test/columnstore/autopilot/t/mcs4004_autopilot_batchInsert_ldi.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4004_autopilot_batchInsert_ldi.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4004_db;
--- a/mysql-test/columnstore/autopilot/t/mcs4005_autopilot_add_drop_columns.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4005_autopilot_add_drop_columns.test
@@ -4,6 +4,7 @@
 # Author: Daniel Lee, daniel.lee@mariadb.com
 # -------------------------------------------------------------- #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4005_db;
--- a/mysql-test/columnstore/autopilot/t/mcs4006_autopilot_create_dbt3_database_1m.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4006_autopilot_create_dbt3_database_1m.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4006_db;
--- a/mysql-test/columnstore/autopilot/t/mcs4007_autopilot_dbt3_performance_queries_1g.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4007_autopilot_dbt3_performance_queries_1g.test
@@ -8,6 +8,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4007_db;
--- a/mysql-test/columnstore/autopilot/t/mcs4008_autopilot_sanity_test.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4008_autopilot_sanity_test.test
@@ -4,6 +4,7 @@
 # Author: Daniel Lee, daniel.lee@mariadb.com
 # -------------------------------------------------------------- #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4008_db;
--- a/mysql-test/columnstore/autopilot/t/mcs4010_autopilot_cross_engine_join.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4010_autopilot_cross_engine_join.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4010_db;
--- a/mysql-test/columnstore/autopilot/t/mcs4011_autopilot_query_stats.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4011_autopilot_query_stats.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 --disable_warnings
 DROP DATABASE IF EXISTS mcs4011_db;
--- a/mysql-test/columnstore/autopilot/t/mcs4125_function_CNX_LAST_DAY_DS.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4125_function_CNX_LAST_DAY_DS.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4125_function_CNX_LAST_DAY_DS_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4125_function_CNX_LAST_DAY_DS_maxscale.test
@@ -0,0 +1,23 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CDATE, LAST_DAY(CDATE) from datatypetestm order by cidx;
+select cidx, CDATETIME, LAST_DAY(CDATETIME) from datatypetestm order by cidx;
+--replace_column 3 REPLACEDVALUE
+select cidx, CTIME, LAST_DAY(CTIME) from datatypetestm order by cidx;
+select cidx, LAST_DAY('2009-02-28') from datatypetestm order by cidx;
+select cidx, LAST_DAY('2009-07-04') from datatypetestm order by cidx;
+select cidx, LAST_DAY('2010-02-31') from datatypetestm order by cidx;
+select cidx, CDATE from datatypetestm where LAST_DAY(CDATE) <> 0 order by cidx;
+select cidx, CDATETIME from datatypetestm where LAST_DAY(CDATETIME) <> 0 order by cidx;
+#select cidx, CTIME from datatypetestm where LAST_DAY(CTIME) <> 0 order by cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs4154_function_CNX_MICROSECOND_DS.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4154_function_CNX_MICROSECOND_DS.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4154_function_CNX_MICROSECOND_DS_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4154_function_CNX_MICROSECOND_DS_maxscale.test
@@ -0,0 +1,21 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CDATE, MICROSECOND(CDATE) from datatypetestm order by cidx;
+select cidx, CDATETIME, MICROSECOND(CDATETIME) from datatypetestm order by cidx;
+select cidx, CTIME, MICROSECOND(CTIME) from datatypetestm order by cidx;
+select cidx, MICROSECOND('2011-05-01') from datatypetestm order by cidx;
+select cidx, MICROSECOND('2011-05-01 13:58:22.123456') from datatypetestm order by cidx;
+select cidx, CDATE from datatypetestm where MICROSECOND(CDATE) <> 0 order by cidx;
+select cidx, CDATETIME from datatypetestm where MICROSECOND(CDATETIME) <> 0 order by cidx;
+select cidx, CTIME from datatypetestm where MICROSECOND(CTIME) <> 0 order by cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs4162_function_CNX_MONTHNAME_DS.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4162_function_CNX_MONTHNAME_DS.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4162_function_CNX_MONTHNAME_DS_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4162_function_CNX_MONTHNAME_DS_maxscale.test
@@ -0,0 +1,23 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CDATE, MONTHNAME(CDATE) from datatypetestm order by cidx;
+select cidx, CDATETIME, MONTHNAME(CDATETIME) from datatypetestm order by cidx;
+--replace_column 3 REPLACEDVALUE
+select cidx, CTIME, MONTHNAME(CTIME) from datatypetestm order by cidx;
+select cidx, MONTHNAME('2009-02-28') from datatypetestm order by cidx;
+select cidx, MONTHNAME('2009-07-04') from datatypetestm order by cidx;
+select cidx, MONTHNAME('2010-02-31') from datatypetestm order by cidx;
+select cidx, CDATE from datatypetestm where MONTHNAME(CDATE) <> 0 order by cidx;
+select cidx, CDATETIME from datatypetestm where MONTHNAME(CDATETIME) <> 0 order by cidx;
+#select cidx, CTIME from datatypetestm where MONTHNAME(CTIME) <> 0 order by cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs4164_function_CNX_NULLIF_NM_Archived.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4164_function_CNX_NULLIF_NM_Archived.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4164_function_CNX_NULLIF_NM_Archived_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4164_function_CNX_NULLIF_NM_Archived_maxscale.test
@@ -0,0 +1,313 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CBIGINT, NULLIF(CBIGINT,CBIGINT) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CINTEGER) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,1) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,3.14) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CCHAR4) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CDATE) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,NULL) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CBIGINT) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CINTEGER) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,1) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,3.14) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CCHAR4) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CDATE) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,NULL) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CBIGINT) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CINTEGER) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,1) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,3.14) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CCHAR4) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDATE) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,NULL) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CBIGINT) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CINTEGER) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,1) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,3.14) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CCHAR4) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CDATE) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,NULL) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,1) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,3.14) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDATE) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,NULL) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CBIGINT) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CINTEGER) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,1) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,3.14) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CCHAR4) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CDATE) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,NULL) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CBIGINT) <> 0 order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CINTEGER) <> 0 order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CDOUBLE) <> 0 order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,1) <> 0 order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,3.14) <> 0 order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CCHAR4) <> 0 order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,CDATE) <> 0 order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,NULL) <> 0 order by cidx;
+select cidx, CBIGINT from datatypetestm where NULLIF(CBIGINT,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CBIGINT) <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CINTEGER) <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CDOUBLE) <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,1) <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,3.14) <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CCHAR4) <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,CDATE) <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,NULL) <> 0 order by cidx;
+select cidx, CDECIMAL1 from datatypetestm where NULLIF(CDECIMAL1,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CBIGINT) <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CINTEGER) <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CDOUBLE) <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,1) <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,3.14) <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CCHAR4) <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,CDATE) <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,NULL) <> 0 order by cidx;
+select cidx, CDECIMAL4 from datatypetestm where NULLIF(CDECIMAL4,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CBIGINT) <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CINTEGER) <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CDOUBLE) <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,1) <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,3.14) <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CCHAR4) <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,CDATE) <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,NULL) <> 0 order by cidx;
+select cidx, CDECIMAL4_2 from datatypetestm where NULLIF(CDECIMAL4_2,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CBIGINT) <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CINTEGER) <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CDOUBLE) <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,1) <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,3.14) <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CCHAR4) <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,CDATE) <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,NULL) <> 0 order by cidx;
+select cidx, CDECIMAL5 from datatypetestm where NULLIF(CDECIMAL5,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CBIGINT) <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CINTEGER) <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CDOUBLE) <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,1) <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,3.14) <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CCHAR4) <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,CDATE) <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,NULL) <> 0 order by cidx;
+select cidx, CDECIMAL9 from datatypetestm where NULLIF(CDECIMAL9,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CBIGINT) <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CINTEGER) <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CDOUBLE) <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,1) <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,3.14) <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CCHAR4) <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,CDATE) <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,NULL) <> 0 order by cidx;
+select cidx, CDECIMAL9_2 from datatypetestm where NULLIF(CDECIMAL9_2,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CBIGINT) <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CINTEGER) <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CDOUBLE) <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,1) <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,3.14) <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CCHAR4) <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,CDATE) <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,NULL) <> 0 order by cidx;
+select cidx, CDECIMAL10 from datatypetestm where NULLIF(CDECIMAL10,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CBIGINT) <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CINTEGER) <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CDOUBLE) <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,1) <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,3.14) <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CCHAR4) <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,CDATE) <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,NULL) <> 0 order by cidx;
+select cidx, CDECIMAL18 from datatypetestm where NULLIF(CDECIMAL18,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CBIGINT) <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CINTEGER) <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CDOUBLE) <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,1) <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,3.14) <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CCHAR4) <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,CDATE) <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,NULL) <> 0 order by cidx;
+select cidx, CDECIMAL18_2 from datatypetestm where NULLIF(CDECIMAL18_2,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CBIGINT) <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CINTEGER) <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CDOUBLE) <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,1) <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,3.14) <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CCHAR4) <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,CDATE) <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,NULL) <> 0 order by cidx;
+select cidx, CINTEGER from datatypetestm where NULLIF(CINTEGER,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CBIGINT) <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CINTEGER) <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CDOUBLE) <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,1) <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,3.14) <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CCHAR4) <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,CDATE) <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,NULL) <> 0 order by cidx;
+select cidx, CSMALLINT from datatypetestm where NULLIF(CSMALLINT,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CBIGINT) <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CINTEGER) <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CDOUBLE) <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,1) <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,3.14) <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CCHAR4) <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,CDATE) <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,NULL) <> 0 order by cidx;
+select cidx, CTINYINT from datatypetestm where NULLIF(CTINYINT,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CBIGINT) <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CINTEGER) <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CDOUBLE) <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,1) <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,3.14) <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CCHAR4) <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,CDATE) <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,NULL) <> 0 order by cidx;
+select cidx, CDOUBLE from datatypetestm where NULLIF(CDOUBLE,'HELLO WORLD') <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CBIGINT) <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CINTEGER) <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CDOUBLE) <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CDECIMAL9_2) <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,1) <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,3.14) <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CCHAR4) <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,CDATE) <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,NULL) <> 0 order by cidx;
+select cidx, CFLOAT from datatypetestm where NULLIF(CFLOAT,'HELLO WORLD') <> 0 order by cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs4220_function_CNX_TIME_TO_SEC_DS.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4220_function_CNX_TIME_TO_SEC_DS.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4220_function_CNX_TIME_TO_SEC_DS_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4220_function_CNX_TIME_TO_SEC_DS_maxscale.test
@@ -0,0 +1,22 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CDATE, TIME_TO_SEC(CDATE) from datatypetestm order by cidx;
+select cidx, CDATETIME, TIME_TO_SEC(CDATETIME) from datatypetestm order by cidx;
+select cidx, CTIME, TIME_TO_SEC(CTIME) from datatypetestm order by cidx;
+select cidx, TIME_TO_SEC('22:23:00') from datatypetestm order by cidx;
+select cidx, TIME_TO_SEC('00:39:38') from datatypetestm order by cidx;
+select cidx, TIME_TO_SEC('22:23:49 999999') from datatypetestm order by cidx;
+select cidx, CDATE from datatypetestm where TIME_TO_SEC(CDATE) <> 0 order by cidx;
+select cidx, CDATETIME from datatypetestm where TIME_TO_SEC(CDATETIME) <> 0 order by cidx;
+select cidx, CTIME from datatypetestm where TIME_TO_SEC(CTIME) <> 0 order by cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs4350_function_CNXPP_LAST_DAY_DS.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4350_function_CNXPP_LAST_DAY_DS.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4350_function_CNXPP_LAST_DAY_DS_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4350_function_CNXPP_LAST_DAY_DS_maxscale.test
@@ -0,0 +1,23 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CDATE, LAST_DAY(CDATE) from datatypetestm order by cidx;
+select cidx, CDATETIME, LAST_DAY(CDATETIME) from datatypetestm order by cidx;
+--replace_column 3 REPLACEDVALUE
+select cidx, CTIME, LAST_DAY(CTIME) from datatypetestm order by cidx;
+select cidx, LAST_DAY('2009-02-28') from datatypetestm order by cidx;
+select cidx, LAST_DAY('2009-07-04') from datatypetestm order by cidx;
+select cidx, LAST_DAY('2010-02-31') from datatypetestm order by cidx;
+select cidx, CDATE from datatypetestm order by LAST_DAY(CDATE), cidx;
+select cidx, CDATETIME from datatypetestm order by LAST_DAY(CDATETIME), cidx;
+#select cidx, CTIME from datatypetestm order by LAST_DAY(CTIME), cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs4379_function_CNXPP_MICROSECOND_DS.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4379_function_CNXPP_MICROSECOND_DS.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4379_function_CNXPP_MICROSECOND_DS_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4379_function_CNXPP_MICROSECOND_DS_maxscale.test
@@ -0,0 +1,21 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CDATE, MICROSECOND(CDATE) from datatypetestm order by cidx;
+select cidx, CDATETIME, MICROSECOND(CDATETIME) from datatypetestm order by cidx;
+select cidx, CTIME, MICROSECOND(CTIME) from datatypetestm order by cidx;
+select cidx, MICROSECOND('2011-05-01') from datatypetestm order by cidx;
+select cidx, MICROSECOND('2011-05-01 13:58:22.123456') from datatypetestm order by cidx;
+select cidx, CDATE from datatypetestm order by MICROSECOND(CDATE), cidx;
+select cidx, CDATETIME from datatypetestm order by MICROSECOND(CDATETIME), cidx;
+select cidx, CTIME from datatypetestm order by MICROSECOND(CTIME), cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs4387_function_CNXPP_MONTHNAME_DS.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4387_function_CNXPP_MONTHNAME_DS.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4387_function_CNXPP_MONTHNAME_DS_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4387_function_CNXPP_MONTHNAME_DS_maxscale.test
@@ -0,0 +1,23 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CDATE, MONTHNAME(CDATE) from datatypetestm order by cidx;
+select cidx, CDATETIME, MONTHNAME(CDATETIME) from datatypetestm order by cidx;
+--replace_column 3 REPLACEDVALUE
+select cidx, CTIME, MONTHNAME(CTIME) from datatypetestm order by cidx;
+select cidx, MONTHNAME('2009-02-28') from datatypetestm order by cidx;
+select cidx, MONTHNAME('2009-07-04') from datatypetestm order by cidx;
+select cidx, MONTHNAME('2010-02-31') from datatypetestm order by cidx;
+select cidx, CDATE from datatypetestm order by MONTHNAME(CDATE), cidx;
+select cidx, CDATETIME from datatypetestm order by MONTHNAME(CDATETIME), cidx;
+#select cidx, CTIME from datatypetestm order by MONTHNAME(CTIME), cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs4389_function_CNXPP_NULLIF_NM_Archived.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4389_function_CNXPP_NULLIF_NM_Archived.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4389_function_CNXPP_NULLIF_NM_Archived_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4389_function_CNXPP_NULLIF_NM_Archived_maxscale.test
@@ -0,0 +1,313 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CBIGINT, NULLIF(CBIGINT,CBIGINT) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CINTEGER) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,1) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,3.14) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CCHAR4) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,CDATE) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,NULL) from datatypetestm order by cidx;
+select cidx, CBIGINT, NULLIF(CBIGINT,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL1, NULLIF(CDECIMAL1,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL4, NULLIF(CDECIMAL4,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL4_2, NULLIF(CDECIMAL4_2,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL5, NULLIF(CDECIMAL5,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL9, NULLIF(CDECIMAL9,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL9_2, NULLIF(CDECIMAL9_2,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL10, NULLIF(CDECIMAL10,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL18, NULLIF(CDECIMAL18,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,1) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,3.14) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,CDATE) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,NULL) from datatypetestm order by cidx;
+select cidx, CDECIMAL18_2, NULLIF(CDECIMAL18_2,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CBIGINT) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CINTEGER) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,1) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,3.14) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CCHAR4) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,CDATE) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,NULL) from datatypetestm order by cidx;
+select cidx, CINTEGER, NULLIF(CINTEGER,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CBIGINT) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CINTEGER) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,1) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,3.14) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CCHAR4) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,CDATE) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,NULL) from datatypetestm order by cidx;
+select cidx, CSMALLINT, NULLIF(CSMALLINT,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CBIGINT) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CINTEGER) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,1) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,3.14) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CCHAR4) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,CDATE) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,NULL) from datatypetestm order by cidx;
+select cidx, CTINYINT, NULLIF(CTINYINT,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CBIGINT) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CINTEGER) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,1) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,3.14) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CCHAR4) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,CDATE) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,NULL) from datatypetestm order by cidx;
+select cidx, CDOUBLE, NULLIF(CDOUBLE,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CBIGINT) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CINTEGER) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CDOUBLE) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CDECIMAL9_2) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,1) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,3.14) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CCHAR4) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,CDATE) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,NULL) from datatypetestm order by cidx;
+select cidx, CFLOAT, NULLIF(CFLOAT,'HELLO WORLD') from datatypetestm order by cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CBIGINT), cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CINTEGER), cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CDOUBLE), cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CDECIMAL9_2), cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,1), cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,3.14), cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CCHAR4), cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,CDATE), cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,NULL), cidx;
+select cidx, CBIGINT from datatypetestm order by NULLIF(CBIGINT,'HELLO WORLD'), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CBIGINT), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CINTEGER), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CDOUBLE), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CDECIMAL9_2), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,1), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,3.14), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CCHAR4), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,CDATE), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,NULL), cidx;
+select cidx, CDECIMAL1 from datatypetestm order by NULLIF(CDECIMAL1,'HELLO WORLD'), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CBIGINT), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CINTEGER), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CDOUBLE), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CDECIMAL9_2), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,1), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,3.14), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CCHAR4), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,CDATE), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,NULL), cidx;
+select cidx, CDECIMAL4 from datatypetestm order by NULLIF(CDECIMAL4,'HELLO WORLD'), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CBIGINT), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CINTEGER), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CDOUBLE), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CDECIMAL9_2), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,1), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,3.14), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CCHAR4), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,CDATE), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,NULL), cidx;
+select cidx, CDECIMAL4_2 from datatypetestm order by NULLIF(CDECIMAL4_2,'HELLO WORLD'), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CBIGINT), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CINTEGER), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CDOUBLE), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CDECIMAL9_2), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,1), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,3.14), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CCHAR4), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,CDATE), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,NULL), cidx;
+select cidx, CDECIMAL5 from datatypetestm order by NULLIF(CDECIMAL5,'HELLO WORLD'), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CBIGINT), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CINTEGER), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CDOUBLE), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CDECIMAL9_2), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,1), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,3.14), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CCHAR4), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,CDATE), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,NULL), cidx;
+select cidx, CDECIMAL9 from datatypetestm order by NULLIF(CDECIMAL9,'HELLO WORLD'), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CBIGINT), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CINTEGER), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CDOUBLE), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CDECIMAL9_2), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,1), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,3.14), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CCHAR4), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,CDATE), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,NULL), cidx;
+select cidx, CDECIMAL9_2 from datatypetestm order by NULLIF(CDECIMAL9_2,'HELLO WORLD'), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CBIGINT), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CINTEGER), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CDOUBLE), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CDECIMAL9_2), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,1), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,3.14), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CCHAR4), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,CDATE), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,NULL), cidx;
+select cidx, CDECIMAL10 from datatypetestm order by NULLIF(CDECIMAL10,'HELLO WORLD'), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CBIGINT), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CINTEGER), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CDOUBLE), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CDECIMAL9_2), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,1), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,3.14), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CCHAR4), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,CDATE), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,NULL), cidx;
+select cidx, CDECIMAL18 from datatypetestm order by NULLIF(CDECIMAL18,'HELLO WORLD'), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CBIGINT), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CINTEGER), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CDOUBLE), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CDECIMAL9_2), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,1), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,3.14), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CCHAR4), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,CDATE), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,NULL), cidx;
+select cidx, CDECIMAL18_2 from datatypetestm order by NULLIF(CDECIMAL18_2,'HELLO WORLD'), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CBIGINT), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CINTEGER), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CDOUBLE), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CDECIMAL9_2), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,1), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,3.14), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CCHAR4), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,CDATE), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,NULL), cidx;
+select cidx, CINTEGER from datatypetestm order by NULLIF(CINTEGER,'HELLO WORLD'), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CBIGINT), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CINTEGER), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CDOUBLE), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CDECIMAL9_2), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,1), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,3.14), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CCHAR4), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,CDATE), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,NULL), cidx;
+select cidx, CSMALLINT from datatypetestm order by NULLIF(CSMALLINT,'HELLO WORLD'), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CBIGINT), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CINTEGER), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CDOUBLE), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CDECIMAL9_2), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,1), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,3.14), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CCHAR4), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,CDATE), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,NULL), cidx;
+select cidx, CTINYINT from datatypetestm order by NULLIF(CTINYINT,'HELLO WORLD'), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CBIGINT), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CINTEGER), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CDOUBLE), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CDECIMAL9_2), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,1), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,3.14), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CCHAR4), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,CDATE), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,NULL), cidx;
+select cidx, CDOUBLE from datatypetestm order by NULLIF(CDOUBLE,'HELLO WORLD'), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CBIGINT), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CINTEGER), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CDOUBLE), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CDECIMAL9_2), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,1), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,3.14), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CCHAR4), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,CDATE), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,NULL), cidx;
+select cidx, CFLOAT from datatypetestm order by NULLIF(CFLOAT,'HELLO WORLD'), cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs4445_function_CNXPP_TIME_TO_SEC_DS.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4445_function_CNXPP_TIME_TO_SEC_DS.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/autopilot/t/mcs4445_function_CNXPP_TIME_TO_SEC_DS_maxscale.test
+++ b/mysql-test/columnstore/autopilot/t/mcs4445_function_CNXPP_TIME_TO_SEC_DS_maxscale.test
@@ -0,0 +1,22 @@
+# -------------------------------------------------------------- #
+# Test case migrated from Autopilot functions test suite
+#
+# Author: Daniel Lee, daniel.lee@mariadb.com
+# -------------------------------------------------------------- #
+#
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+--disable_warnings
+#
+USE autopilot;
+#
+select cidx, CDATE, TIME_TO_SEC(CDATE) from datatypetestm order by cidx;
+select cidx, CDATETIME, TIME_TO_SEC(CDATETIME) from datatypetestm order by cidx;
+select cidx, CTIME, TIME_TO_SEC(CTIME) from datatypetestm order by cidx;
+select cidx, TIME_TO_SEC('22:23:00') from datatypetestm order by cidx;
+select cidx, TIME_TO_SEC('00:39:38') from datatypetestm order by cidx;
+select cidx, TIME_TO_SEC('22:23:49 999999') from datatypetestm order by cidx;
+select cidx, CDATE from datatypetestm order by TIME_TO_SEC(CDATE), cidx;
+select cidx, CDATETIME from datatypetestm order by TIME_TO_SEC(CDATETIME), cidx;
+select cidx, CTIME from datatypetestm order by TIME_TO_SEC(CTIME), cidx;
+--enable_warnings
--- a/mysql-test/columnstore/autopilot/t/mcs6721_json_JSON_ARRAY.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6721_json_JSON_ARRAY.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 #
 USE autopilot;
 #
--- a/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl.result
+++ b/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl.result
@@ -1,5 +1,6 @@
 DROP DATABASE IF EXISTS MCOL5744;
 CREATE DATABASE MCOL5744;
+USE MCOL5744;
 SET old_mode='';
 CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE;
 SHOW CREATE TABLE t;
--- a/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl_maxscale.result
+++ b/mysql-test/columnstore/basic/r/MCOL-5744-utf8-in-ddl_maxscale.result
@@ -0,0 +1,19 @@
+DROP DATABASE IF EXISTS MCOL5744;
+CREATE DATABASE MCOL5744;
+SET old_mode='';
+CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE;
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `x` text DEFAULT NULL
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+DROP TABLE t;
+SET old_mode='UTF8_IS_UTF8MB3';
+CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE;
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `x` text DEFAULT NULL
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+DROP TABLE t;
+DROP DATABASE MCOL5744;
--- a/mysql-test/columnstore/basic/r/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.result
+++ b/mysql-test/columnstore/basic/r/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.result
@@ -13,3 +13,6 @@ COUNT(*)
 SELECT COUNT(*) FROM (SELECT * FROM t2 UNION ALL SELECT * FROM t1 PARTITION (p0)) tt;
 COUNT(*)
 20
+REVOKE ALL PRIVILEGES ON *.* FROM 'cejuser'@'localhost';
+DROP USER 'cejuser'@'localhost';
+DROP DATABASE MCOL5886;
--- a/mysql-test/columnstore/basic/r/analyze_table.result
+++ b/mysql-test/columnstore/basic/r/analyze_table.result
@@ -3,23 +3,29 @@ CREATE DATABASE analyze_table_db;
 USE analyze_table_db;
 create table t1 (a int, b int, c int) engine=columnstore;
 insert into t1 values (1, 2, 3), (2, 2, 2), (2, 3, 4);
-analyze table t1;
+analyze table t1 PERSISTENT FOR ALL;
 Table	Op	Msg_type	Msg_text
+analyze_table_db.t1	analyze	status	Engine-independent statistics collected
 analyze_table_db.t1	analyze	status	OK
 create table t2 (a int, b double) engine=columnstore;
 insert into t2 values (2, 3), (3, 4);
-analyze table t2;
+analyze table t2 PERSISTENT FOR ALL;
 Table	Op	Msg_type	Msg_text
+analyze_table_db.t2	analyze	status	Engine-independent statistics collected
 analyze_table_db.t2	analyze	status	OK
 create table t3 (a varchar(25)) engine=columnstore;
 insert into t3 values ("a"), ("b");
-analyze table t3;
+analyze table t3 PERSISTENT FOR ALL;
 Table	Op	Msg_type	Msg_text
+analyze_table_db.t3	analyze	status	Engine-independent statistics collected
 analyze_table_db.t3	analyze	status	OK
-analyze table t1, t2, t3;
+analyze table t1, t2, t3 PERSISTENT FOR ALL;
 Table	Op	Msg_type	Msg_text
+analyze_table_db.t1	analyze	status	Engine-independent statistics collected
 analyze_table_db.t1	analyze	status	OK
+analyze_table_db.t2	analyze	status	Engine-independent statistics collected
 analyze_table_db.t2	analyze	status	OK
+analyze_table_db.t3	analyze	status	Engine-independent statistics collected
 analyze_table_db.t3	analyze	status	OK
 DROP TABLE t1;
 DROP TABLE t2;
--- a/mysql-test/columnstore/basic/r/mcol-5005.result
+++ b/mysql-test/columnstore/basic/r/mcol-5005.result
@@ -58,7 +58,8 @@ t4	CREATE TABLE `t4` (
  `a` varchar(15) DEFAULT NULL
 ) ENGINE=Columnstore DEFAULT CHARSET=latin2 COLLATE=latin2_general_ci
 SELECT `schema`, tablename, columnname, charsetnum FROM calpontsys.syscolumn
-WHERE `schema`='mcol5005' AND tablename in ('t1', 't2', 't3', 't4');
+WHERE `schema`='mcol5005' AND tablename in ('t1', 't2', 't3', 't4')
+ORDER BY tablename, columnname, charsetnum;
 schema	tablename	columnname	charsetnum
 mcol5005	t1	a	227
 mcol5005	t1	b	33
--- a/mysql-test/columnstore/basic/r/mcol641-aggregate.result
+++ b/mysql-test/columnstore/basic/r/mcol641-aggregate.result
@@ -497,3 +497,4 @@ DROP TABLE cs2;
 DROP TABLE cs3;
 DROP TABLE cs4;
 DROP TABLE cs5;
+DROP DATABASE test_mcol641_aggregate;
--- a/mysql-test/columnstore/basic/r/mcol641-create.result
+++ b/mysql-test/columnstore/basic/r/mcol641-create.result
@@ -11,7 +11,17 @@ CREATE TABLE cs3(d1 DECIMAL(38) UNSIGNED ZEROFILL, d2 DECIMAL(38,10) UNSIGNED ZE
 Warnings:
 Warning	1618	ZEROFILL is ignored in ColumnStore
 CREATE TABLE cs4(d1 DECIMAL(18), d2 DECIMAL(18,10), d3 DECIMAL(18,18)) ENGINE=columnstore;
-SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_name = 'cs1' OR table_name = 'cs2' OR table_name = 'cs3' OR table_name = 'cs4' ORDER BY table_name,column_name ASC;
+SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_name = 'cs1' OR table_name = 'cs2' OR table_name = 'cs3' OR table_name = 'cs4'
+ORDER BY
+TABLE_SCHEMA,
+TABLE_NAME,
+COLUMN_NAME,
+DATA_TYPE,
+COLUMN_LENGTH,
+COLUMN_POSITION,
+COLUMN_DEFAULT,
+NUMERIC_PRECISION,
+NUMERIC_SCALE;
 TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	DATA_TYPE	COLUMN_LENGTH	COLUMN_POSITION	COLUMN_DEFAULT	NUMERIC_PRECISION	NUMERIC_SCALE
 test_mcol641_create	cs1	d1	decimal	16	0	NULL	38	0
 test_mcol641_create	cs1	d2	decimal	16	1	NULL	38	10
@@ -40,7 +50,17 @@ ALTER TABLE cs2 ADD COLUMN (d5 DECIMAL(38,5), d6 DECIMAL(35,15));
 ERROR 42000: The storage engine for the table doesn't support Multiple actions in alter table statement is currently not supported by Columnstore.
 ALTER TABLE cs3 MODIFY d1 DECIMAL(38) SIGNED;
 ERROR HY000: Internal error: CAL0001: Alter table Failed:  Altertable: Error in the action type  
-SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_schema = 'test_mcol641_create' ORDER BY table_name,column_name ASC;
+SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_schema = 'test_mcol641_create'
+ORDER BY
+TABLE_SCHEMA,
+TABLE_NAME,
+COLUMN_NAME,
+DATA_TYPE,
+COLUMN_LENGTH,
+COLUMN_POSITION,
+COLUMN_DEFAULT,
+NUMERIC_PRECISION,
+NUMERIC_SCALE;
 TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	DATA_TYPE	COLUMN_LENGTH	COLUMN_POSITION	COLUMN_DEFAULT	NUMERIC_PRECISION	NUMERIC_SCALE
 test_mcol641_create	cs1	d1	decimal	16	0	NULL	38	0
 test_mcol641_create	cs1	d2	decimal	16	1	NULL	38	10
--- a/mysql-test/columnstore/basic/r/mcs10_drop_db_table.result
+++ b/mysql-test/columnstore/basic/r/mcs10_drop_db_table.result
@@ -62,8 +62,6 @@ DROP TABLE IF EXISTS mcs10_db2.t_columnstore1;
 USE mcs10_db1;
 CREATE TABLE t_columnstore1 (id int) engine=columnstore;
 CREATE TABLE t_columnstore2 (id int) engine=columnstore;
-connect  addconroot1, localhost, root,,;
-connect  addconroot2, localhost, root,,;
 connection addconroot1;
 DROP TABLE mcs10_db1.t_columnstore1;
 connection addconroot2;
--- a/mysql-test/columnstore/basic/r/mcs117_create_utf8_maxscale.result
+++ b/mysql-test/columnstore/basic/r/mcs117_create_utf8_maxscale.result
@@ -0,0 +1,39 @@
+set names utf8;
+DROP DATABASE IF EXISTS mcs117_db;
+CREATE DATABASE имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+USE имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+SELECT DATABASE();
+DATABASE()
+имя_базы_в_кодировке_утф8_длиной_больше_чем_45
+CREATE DATABASE mcs117_db;
+USE mcs117_db;
+SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.schemata
+WHERE schema_name='имя_базы_в_кодировке_утф8_длиной_больше_чем_45';
+SCHEMA_NAME
+имя_базы_в_кодировке_утф8_длиной_больше_чем_45
+DROP DATABASE имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+CREATE TABLE имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48
+(
+имя_поля_в_кодировке_утф8_длиной_больше_чем_45 INT
+)ENGINE=Columnstore;
+SHOW CREATE TABLE имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
+Table	Create Table
+имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48	CREATE TABLE `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48` (
+  `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` int(11) DEFAULT NULL
+) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+CREATE VIEW имя_вью_кодировке_утф8_длиной_больше_чем_42 AS SELECT * FROM имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
+SHOW CREATE VIEW  имя_вью_кодировке_утф8_длиной_больше_чем_42;
+View	Create View	character_set_client	collation_connection
+имя_вью_кодировке_утф8_длиной_больше_чем_42	CREATE ALGORITHM=UNDEFINED DEFINER=`testUser`@`%` SQL SECURITY DEFINER VIEW `имя_вью_кодировке_утф8_длиной_больше_чем_42` AS select `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`.`имя_поля_в_кодировке_утф8_длиной_больше_чем_45` AS `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` from `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`	utf8mb3	utf8mb3_general_ci
+select TABLE_NAME from information_schema.tables where table_schema='mcs117_db' order by 1;
+TABLE_NAME
+имя_вью_кодировке_утф8_длиной_больше_чем_42
+имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48
+select COLUMN_NAME from information_schema.columns where table_schema='mcs117_db' order by 1;
+COLUMN_NAME
+имя_поля_в_кодировке_утф8_длиной_больше_чем_45
+имя_поля_в_кодировке_утф8_длиной_больше_чем_45
+select TABLE_NAME from information_schema.views where table_schema='mcs117_db' order by 1;
+TABLE_NAME
+имя_вью_кодировке_утф8_длиной_больше_чем_42
+DROP DATABASE mcs117_db;
--- a/mysql-test/columnstore/basic/r/mcs11_show_db_table.result
+++ b/mysql-test/columnstore/basic/r/mcs11_show_db_table.result
@@ -40,8 +40,6 @@ SHOW TABLES IN mcs11_db2;
 Tables_in_mcs11_db2
 t1
 t2
-connect  addconroot1, localhost, root,,;
-connect  addconroot2, localhost, root,,;
 connection addconroot1;
 SHOW DATABASES LIKE 'mcs11%';
 Database (mcs11%)
--- a/mysql-test/columnstore/basic/r/mcs12_alter_table.result
+++ b/mysql-test/columnstore/basic/r/mcs12_alter_table.result
@@ -114,8 +114,6 @@ new_i	c	i2
 2	b	22
 DROP TABLE t1;
 CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore;
-connect  addconroot1, localhost, root,,;
-connect  addconroot2, localhost, root,,;
 connection addconroot1;
 SHOW CREATE TABLE mcs12_db1.t1;
 Table	Create Table
--- a/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result
+++ b/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result
@@ -38,8 +38,6 @@ ALTER TABLE t1 ADD PRIMARY KEY pk(c1);
 ERROR 42000: Too many keys specified; max 0 keys allowed
 ALTER TABLE t1 DROP KEY k1;
 ERROR 42000: Can't DROP INDEX `k1`; check that it exists
-connect  addconroot1, localhost, root,,;
-connect  addconroot2, localhost, root,,;
 connection addconroot1;
 ALTER TABLE mcs13_db1.t1 CHANGE c1 c2 INVALIDDATATYPE;
 ERROR HY000: Unknown data type: 'INVALIDDATATYPE'
@@ -60,3 +58,4 @@ a	c1
 disconnect addconroot1;
 disconnect addconroot2;
 DROP DATABASE mcs13_db1;
+DROP DATABASE mcs13_db2;
--- a/mysql-test/columnstore/basic/r/mcs14_truncate_table.result
+++ b/mysql-test/columnstore/basic/r/mcs14_truncate_table.result
@@ -65,8 +65,6 @@ CREATE TABLE t1 (id INT) ENGINE=Columnstore;
 INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5);
 CREATE TABLE t2 LIKE t1;
 INSERT INTO t2 SELECT * FROM t1;
-connect  addconroot1, localhost, root,,;
-connect  addconroot2, localhost, root,,;
 connection addconroot1;
 TRUNCATE mcs14_db1.t1;
 connection addconroot2;
--- a/mysql-test/columnstore/basic/r/mcs170_session_functions_maxscale.result
+++ b/mysql-test/columnstore/basic/r/mcs170_session_functions_maxscale.result
@@ -0,0 +1,23 @@
+SET default_storage_engine=Columnstore;
+DROP DATABASE IF EXISTS mcs170_db;
+CREATE DATABASE mcs170_db;
+USE mcs170_db;
+SELECT CONNECTION_ID() > 0;
+CONNECTION_ID() > 0
+1
+SELECT CURRENT_USER();
+CURRENT_USER()
+testUser@%
+SELECT USER();
+USER()
+testUser@max
+SELECT SESSION_USER();
+SESSION_USER()
+testUser@max
+SELECT SYSTEM_USER();
+SYSTEM_USER()
+testUser@max
+SELECT DATABASE();
+DATABASE()
+mcs170_db
+DROP DATABASE mcs170_db;
--- a/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
+++ b/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
@@ -23,8 +23,6 @@ SHOW GRANTS FOR 'user1'@'localhost';
 Grants for user1@localhost
 GRANT USAGE ON *.* TO `user1`@`localhost` IDENTIFIED BY PASSWORD '*CB386B3062EFB295ED40F6A5B1A8CFE300642E38'
 GRANT CREATE, SELECT, INSERT ON mcs19_db.* TO 'user1'@'localhost';
-connect conn1, localhost, user1, Vagrant1|0000001,;
-connect conn2, localhost, user1, Vagrant1|0000001,;
 connection conn1;
 SELECT USER();
 USER()
@@ -43,7 +41,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `col` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+) ENGINE=InnoDB
 INSERT INTO t1 VALUES(1);
 SELECT * FROM t1;
 col
--- a/mysql-test/columnstore/basic/r/mcs229_data_compression_type.result
+++ b/mysql-test/columnstore/basic/r/mcs229_data_compression_type.result
@@ -37,16 +37,16 @@ t2	CREATE TABLE `t2` (
  `t2_DATE` date DEFAULT NULL,
  `t2_TIME` time DEFAULT NULL
 ) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
-SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs229_db' ORDER BY 2;
+SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs229_db' ORDER BY 2,3,4;
 schema	tablename	columnname	compressiontype
+mcs229_db	t1	t1_date	2
+mcs229_db	t1	t1_decimal	2
 mcs229_db	t1	t1_int	2
 mcs229_db	t1	t1_text	2
-mcs229_db	t1	t1_date	2
 mcs229_db	t1	t1_time	2
-mcs229_db	t1	t1_decimal	2
 mcs229_db	t2	t2_date	2
+mcs229_db	t2	t2_decimal	2
 mcs229_db	t2	t2_int	2
 mcs229_db	t2	t2_text	2
 mcs229_db	t2	t2_time	2
-mcs229_db	t2	t2_decimal	2
 DROP DATABASE mcs229_db;
--- a/mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test
+++ b/mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test
@@ -1,4 +1,12 @@
+if ($MASTER_MYPORT)
+{
+  # Running without --extern
+  --skip Only works with --extern (will work without extern when cleanup issues are fixed)
+}
+
 --source ../include/have_columnstore.inc
+--source ../include/functions.inc
+--source ../include/syscatalog_mysql.sql

 SET default_storage_engine=columnstore;

--- a/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl.test
+++ b/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl.test
@@ -1,8 +1,13 @@
+--source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
+
 --disable_warnings
 DROP DATABASE IF EXISTS MCOL5744;
 --enable_warnings
+--source ../include/charset.inc

 CREATE DATABASE MCOL5744;
+USE MCOL5744;

 SET old_mode='';

--- a/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl_maxscale.test
+++ b/mysql-test/columnstore/basic/t/MCOL-5744-utf8-in-ddl_maxscale.test
@@ -0,0 +1,22 @@
+--source ../include/have_columnstore.inc
+--source ../include/detect_no_maxscale.inc
+
+--disable_warnings
+DROP DATABASE IF EXISTS MCOL5744;
+--enable_warnings
+
+CREATE DATABASE MCOL5744;
+
+SET old_mode='';
+
+CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE;
+SHOW CREATE TABLE t;
+DROP TABLE t;
+
+SET old_mode='UTF8_IS_UTF8MB3';
+
+CREATE TABLE t(x text CHARACTER SET utf8 COLLATE utf8_general_ci) ENGINE=COLUMNSTORE;
+SHOW CREATE TABLE t;
+DROP TABLE t;
+
+DROP DATABASE MCOL5744;
--- a/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.opt
+++ b/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.opt
@@ -0,0 +1,2 @@
+--skip-partition=0
+--skip-sequence=0
--- a/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.test
+++ b/mysql-test/columnstore/basic/t/MCOL-5886-use-of-partitioned-tables-in-crossengine-steps.test
@@ -1,11 +1,20 @@
+-- source ../include/have_columnstore.inc
+--source include/have_innodb.inc
 --disable_warnings
 DROP DATABASE IF EXISTS MCOL5886;
 --enable_warnings
 CREATE DATABASE MCOL5886;
 USE MCOL5886;

+if (!$MASTER_MYPORT)
+{
+  # Running with --extern
+  let $MASTER_MYPORT=`SELECT @@port`;
+}
+
 --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
 --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
+--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT

 --disable_warnings
 CREATE USER IF NOT EXISTS'cejuser'@'localhost' IDENTIFIED BY 'Vagrant1|0000001';
@@ -21,4 +30,6 @@ CREATE TABLE IF NOT EXISTS t2  ( a DECIMAL(12, 2), b int ) ENGINE=COLUMNSTORE;
 SELECT COUNT(*) FROM (SELECT * FROM t1 PARTITION (p0)) tt;

 SELECT COUNT(*) FROM (SELECT * FROM t2 UNION ALL SELECT * FROM t1 PARTITION (p0)) tt;
-
+REVOKE ALL PRIVILEGES ON *.* FROM 'cejuser'@'localhost';
+DROP USER 'cejuser'@'localhost';
+DROP DATABASE MCOL5886;
--- a/mysql-test/columnstore/basic/t/analyze_table.test
+++ b/mysql-test/columnstore/basic/t/analyze_table.test
@@ -9,18 +9,18 @@ USE analyze_table_db;

 create table t1 (a int, b int, c int) engine=columnstore;
 insert into t1 values (1, 2, 3), (2, 2, 2), (2, 3, 4);
-analyze table t1;
+analyze table t1 PERSISTENT FOR ALL;

 create table t2 (a int, b double) engine=columnstore;
 insert into t2 values (2, 3), (3, 4);
-analyze table t2;
+analyze table t2 PERSISTENT FOR ALL;

 create table t3 (a varchar(25)) engine=columnstore;
 insert into t3 values ("a"), ("b");
-analyze table t3;
+analyze table t3 PERSISTENT FOR ALL;


-analyze table t1, t2, t3;
+analyze table t1, t2, t3 PERSISTENT FOR ALL;

 DROP TABLE t1;
 DROP TABLE t2;
--- a/mysql-test/columnstore/basic/t/cal_named_udfs.test
+++ b/mysql-test/columnstore/basic/t/cal_named_udfs.test
@@ -1,4 +1,5 @@
 -- source ../include/have_columnstore.inc
+--source ../include/functions.inc

 --disable_warnings
 DROP DATABASE IF EXISTS cal_test_db;
@@ -23,3 +24,4 @@ select calgetsqlcount();

 DROP TABLE t1;
 DROP DATABASE cal_test_db;
+--source ../include/drop_functions.inc
--- a/mysql-test/columnstore/basic/t/ctype_cmp_char1_latin1_swedish_ci.test
+++ b/mysql-test/columnstore/basic/t/ctype_cmp_char1_latin1_swedish_ci.test
@@ -1,4 +1,5 @@
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 --source ctype_cmp_combinations.inc
 --source ctype_cmp_create.inc

--- a/mysql-test/columnstore/basic/t/func_json_quote.test
+++ b/mysql-test/columnstore/basic/t/func_json_quote.test
@@ -1,4 +1,6 @@
 --source ../include/have_columnstore.inc
+--source ../include/charset.inc
+
 --disable_warnings
 DROP DATABASE IF EXISTS json_quote_db;

--- a/mysql-test/columnstore/basic/t/func_sec_to_time.test
+++ b/mysql-test/columnstore/basic/t/func_sec_to_time.test
@@ -1,4 +1,5 @@
 --source ../include/have_columnstore.inc
+--source ../include/detect_maxscale.inc
 --source ../include/combinations.myisam-columnstore.inc

 --echo #
--- a/Show More
+++ b/Show More