diff --git a/dbcon/mysql/ha_mcs_ddl.cpp b/dbcon/mysql/ha_mcs_ddl.cpp
index cbd8b7430..0c7fece2f 100644
--- a/dbcon/mysql/ha_mcs_ddl.cpp
+++ b/dbcon/mysql/ha_mcs_ddl.cpp
@@ -867,12 +867,14 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& /*ta
           return rc;
         }
 
+#if MYSQL_VERSION_ID < 110400
         // For TIMESTAMP, if no constraint is given, default to NOT NULL
         if (createTable->fTableDef->fColumns[i]->fType->fType == ddlpackage::DDL_TIMESTAMP &&
             createTable->fTableDef->fColumns[i]->fConstraints.empty())
         {
           createTable->fTableDef->fColumns[i]->fConstraints.push_back(new ColumnConstraintDef(DDL_NOT_NULL));
         }
+#endif
 
         if (createTable->fTableDef->fColumns[i]->fDefaultValue)
         {
diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp
index 5c12480a1..1807c97d7 100644
--- a/dbcon/mysql/ha_mcs_execplan.cpp
+++ b/dbcon/mysql/ha_mcs_execplan.cpp
@@ -6292,7 +6292,7 @@ int processLimitAndOffset(SELECT_LEX& select_lex, gp_walk_info& gwi, SCSEP& csep
 // for the first column of the index if any.
 // Statistics is stored in GWI context.
 // Mock for ES 10.6
-#if MYSQL_VERSION_ID >= 110401
+#if MYSQL_VERSION_ID >= 120401
 void extractColumnStatistics(Item_field* ifp, gp_walk_info& gwi)
 {
   for (uint j = 0; j < ifp->field->table->s->keys; j++)
diff --git a/mysql-test/columnstore/bugfixes/mcol-5480.test b/mysql-test/columnstore/bugfixes/mcol-5480.test
index 37de6bb1c..ad195c357 100644
--- a/mysql-test/columnstore/bugfixes/mcol-5480.test
+++ b/mysql-test/columnstore/bugfixes/mcol-5480.test
@@ -2,7 +2,6 @@
 # MCOL-5480 LDI loads values incorrectly for MEDIUMINT, TIME and TIMESTAMP
 # when cpimport is used for batch insert
 #
---source ../include/disable_11.4.inc
 --source ../include/have_columnstore.inc
 --source ../include/detect_maxscale.inc