From 52082ebfd515815ba5fd77ad1ab29a4d6e11f937 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Wed, 15 Aug 2018 08:30:02 +0100 Subject: [PATCH] MCOL-1653 Fix namespace issue Boost is taken out of global namespace to fix a conflict with MariaDB 10.3. This broke to_string in CentOS. Explicit namespace now used. --- dbcon/mysql/ha_calpont_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp index 62712f42a..8c790e8d4 100644 --- a/dbcon/mysql/ha_calpont_impl.cpp +++ b/dbcon/mysql/ha_calpont_impl.cpp @@ -4109,7 +4109,7 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table) #ifdef _MSC_VER aCmdLine = aCmdLine + "/bin/cpimport.exe -N -P " + to_string(localModuleId) + " -s " + ci->delimiter + " -e 0" + " -E " + escapechar + ci->enclosed_by + " "; #else - aCmdLine = aCmdLine + "/bin/cpimport -m 1 -N -P " + to_string(localModuleId) + " -s " + ci->delimiter + " -e 0" + " -E " + escapechar + ci->enclosed_by + " "; + aCmdLine = aCmdLine + "/bin/cpimport -m 1 -N -P " + boost::to_string(localModuleId) + " -s " + ci->delimiter + " -e 0" + " -E " + escapechar + ci->enclosed_by + " "; #endif } }