From 39a93ef753960943438db3f7bc5f9e1d3b494db2 Mon Sep 17 00:00:00 2001
From: David Hall <mcfadden7586@gmail.com>
Date: Tue, 2 Jun 2020 13:40:15 -0500
Subject: [PATCH] MCOL-3536 Collation

---
 CMakeLists.txt                       | 17 +++++++++++++++++
 dbcon/execplan/predicateoperator.cpp |  3 +--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2774c782..0d76a4e93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,23 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
 
+IF (NOT COMMAND MESSAGE_ONCE)
+    # lifted from the server's definition of message_once
+    IF ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.7")
+        FUNCTION(MESSAGE_ONCE id out)
+            MESSAGE(STATUS "${out}")
+        ENDFUNCTION()
+    ELSE()
+        FUNCTION(MESSAGE_ONCE id out)
+            STRING(MD5 hash "${out}")
+            IF(NOT __msg1_${id} STREQUAL "${hash}")
+                MESSAGE(STATUS "${out}")
+            ENDIF()
+            SET(__msg1_${id} ${hash} CACHE INTERNAL "")
+        ENDFUNCTION()
+    ENDIF()
+ENDIF()
+
 IF(NOT INSTALL_LAYOUT)
     IF(NOT CMAKE_BUILD_TYPE)
         SET(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING
diff --git a/dbcon/execplan/predicateoperator.cpp b/dbcon/execplan/predicateoperator.cpp
index b079f48d7..3e2b907c4 100644
--- a/dbcon/execplan/predicateoperator.cpp
+++ b/dbcon/execplan/predicateoperator.cpp
@@ -350,13 +350,12 @@ void PredicateOperator::setOpType(Type& l, Type& r)
         fOperationType.colDataType = execplan::CalpontSystemCatalog::LONGDOUBLE;
         fOperationType.colWidth = sizeof(long double);
     }
-/*
     else
     {
         fOperationType.colDataType = execplan::CalpontSystemCatalog::DOUBLE;
         fOperationType.colWidth = 8;
     }
-*/    
+
     cs = get_charset(fOperationType.charsetNumber, MYF(MY_WME));
 }