From 72480e512c19ac675cbfe3bda1a0ebf976615783 Mon Sep 17 00:00:00 2001
From: "aleksei.bukhalov" <aleksei.bukhalov@mariadb.com>
Date: Tue, 1 Apr 2025 17:42:47 +0200
Subject: [PATCH] MCOL-5922 add more datatypes for test

---
 .../columnstore/bugfixes/mcol-5992.result     | 63 +++++++++++++++++--
 .../columnstore/bugfixes/mcol-5992.test       | 36 ++++++++++-
 tests/scripts/fullmtr.sh                      |  2 +
 3 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/mysql-test/columnstore/bugfixes/mcol-5992.result b/mysql-test/columnstore/bugfixes/mcol-5992.result
index a061f5f2b..774e7ec27 100644
--- a/mysql-test/columnstore/bugfixes/mcol-5992.result
+++ b/mysql-test/columnstore/bugfixes/mcol-5992.result
@@ -1,9 +1,64 @@
 DROP DATABASE IF EXISTS mcol5992;
 CREATE DATABASE mcol5992;
 USE mcol5992;
-CREATE TABLE `CS_LEG` (`ID` bigint(20) DEFAULT NULL, `sess_count` smallint(6) DEFAULT NULL) ENGINE=Columnstore;
-insert into CS_LEG(ID) values(1);
-select NULLIF(sess_count,0) from CS_LEG;
-NULLIF(sess_count,0)
+CREATE TABLE `CS_LEG` (
+ID BIGINT(20) DEFAULT NULL,
+bigint_col BIGINT(20) DEFAULT NULL,
+tinyint_col TINYINT DEFAULT NULL,
+smallint_col SMALLINT DEFAULT NULL,
+mediumint_col MEDIUMINT DEFAULT NULL,
+int_col INT DEFAULT NULL,
+float_col FLOAT DEFAULT NULL,
+double_col DOUBLE DEFAULT NULL,
+decimal_col DECIMAL(10,2) DEFAULT NULL,
+date_col DATE DEFAULT NULL,
+datetime_col DATETIME DEFAULT NULL,
+time_col TIME DEFAULT NULL,
+varchar_col VARCHAR(255) DEFAULT NULL,
+char_col CHAR(10) DEFAULT NULL,
+text_col TEXT DEFAULT NULL
+) ENGINE=Columnstore;
+INSERT INTO CS_LEG(ID) VALUES(1);
+SELECT NULLIF(bigint_col, 9999999999) FROM CS_LEG;
+NULLIF(bigint_col, 9999999999)
+NULL
+SELECT NULLIF(tinyint_col, 1) FROM CS_LEG;
+NULLIF(tinyint_col, 1)
+NULL
+SELECT NULLIF(smallint_col, 100) FROM CS_LEG;
+NULLIF(smallint_col, 100)
+NULL
+SELECT NULLIF(mediumint_col, 1000) FROM CS_LEG;
+NULLIF(mediumint_col, 1000)
+NULL
+SELECT NULLIF(int_col, 99999) FROM CS_LEG;
+NULLIF(int_col, 99999)
+NULL
+SELECT NULLIF(float_col, 1.1) FROM CS_LEG;
+NULLIF(float_col, 1.1)
+NULL
+SELECT NULLIF(double_col, 2.2) FROM CS_LEG;
+NULLIF(double_col, 2.2)
+NULL
+SELECT NULLIF(decimal_col, 123.45) FROM CS_LEG;
+NULLIF(decimal_col, 123.45)
+NULL
+SELECT NULLIF(date_col, '2025-01-01') FROM CS_LEG;
+NULLIF(date_col, '2025-01-01')
+NULL
+SELECT NULLIF(datetime_col, '2025-01-01 12:00:00') FROM CS_LEG;
+NULLIF(datetime_col, '2025-01-01 12:00:00')
+NULL
+SELECT NULLIF(time_col, '12:00:00') FROM CS_LEG;
+NULLIF(time_col, '12:00:00')
+NULL
+SELECT NULLIF(varchar_col, 'Test') FROM CS_LEG;
+NULLIF(varchar_col, 'Test')
+NULL
+SELECT NULLIF(char_col, 'Test') FROM CS_LEG;
+NULLIF(char_col, 'Test')
+NULL
+SELECT NULLIF(text_col, 'Test') FROM CS_LEG;
+NULLIF(text_col, 'Test')
 NULL
 DROP DATABASE mcol5992;
diff --git a/mysql-test/columnstore/bugfixes/mcol-5992.test b/mysql-test/columnstore/bugfixes/mcol-5992.test
index b67370776..b99769799 100644
--- a/mysql-test/columnstore/bugfixes/mcol-5992.test
+++ b/mysql-test/columnstore/bugfixes/mcol-5992.test
@@ -8,9 +8,39 @@ DROP DATABASE IF EXISTS mcol5992;
 CREATE DATABASE mcol5992;
 USE mcol5992;
 
-CREATE TABLE `CS_LEG` (`ID` bigint(20) DEFAULT NULL, `sess_count` smallint(6) DEFAULT NULL) ENGINE=Columnstore;
+CREATE TABLE `CS_LEG` (
+  ID BIGINT(20) DEFAULT NULL,
+  bigint_col BIGINT(20) DEFAULT NULL,
+  tinyint_col TINYINT DEFAULT NULL,
+  smallint_col SMALLINT DEFAULT NULL,
+  mediumint_col MEDIUMINT DEFAULT NULL,
+  int_col INT DEFAULT NULL,
+  float_col FLOAT DEFAULT NULL,
+  double_col DOUBLE DEFAULT NULL,
+  decimal_col DECIMAL(10,2) DEFAULT NULL,
+  date_col DATE DEFAULT NULL,
+  datetime_col DATETIME DEFAULT NULL,
+  time_col TIME DEFAULT NULL,
+  varchar_col VARCHAR(255) DEFAULT NULL,
+  char_col CHAR(10) DEFAULT NULL,
+  text_col TEXT DEFAULT NULL
+) ENGINE=Columnstore;
 
-insert into CS_LEG(ID) values(1);
-select NULLIF(sess_count,0) from CS_LEG;
+INSERT INTO CS_LEG(ID) VALUES(1);
+
+SELECT NULLIF(bigint_col, 9999999999) FROM CS_LEG;
+SELECT NULLIF(tinyint_col, 1) FROM CS_LEG;
+SELECT NULLIF(smallint_col, 100) FROM CS_LEG;
+SELECT NULLIF(mediumint_col, 1000) FROM CS_LEG;
+SELECT NULLIF(int_col, 99999) FROM CS_LEG;
+SELECT NULLIF(float_col, 1.1) FROM CS_LEG;
+SELECT NULLIF(double_col, 2.2) FROM CS_LEG;
+SELECT NULLIF(decimal_col, 123.45) FROM CS_LEG;
+SELECT NULLIF(date_col, '2025-01-01') FROM CS_LEG;
+SELECT NULLIF(datetime_col, '2025-01-01 12:00:00') FROM CS_LEG;
+SELECT NULLIF(time_col, '12:00:00') FROM CS_LEG;
+SELECT NULLIF(varchar_col, 'Test') FROM CS_LEG;
+SELECT NULLIF(char_col, 'Test') FROM CS_LEG;
+SELECT NULLIF(text_col, 'Test') FROM CS_LEG;
 
 DROP DATABASE mcol5992;
diff --git a/tests/scripts/fullmtr.sh b/tests/scripts/fullmtr.sh
index 470a03c9c..c8e5d4281 100644
--- a/tests/scripts/fullmtr.sh
+++ b/tests/scripts/fullmtr.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 SCRIPT_LOCATION=$(dirname "$0")
 COLUMNSTORE_MTR_SOURCE=$(realpath $SCRIPT_LOCATION/../../mysql-test/columnstore)
 INSTALLED_MTR_PATH='/usr/share/mysql/mysql-test'