diff --git a/cql3/statements/modification_statement.cc b/cql3/statements/modification_statement.cc index fc42862359..8cb330edde 100644 --- a/cql3/statements/modification_statement.cc +++ b/cql3/statements/modification_statement.cc @@ -36,7 +36,7 @@ namespace cql3 { namespace statements { -::shared_ptr modification_statement::CAS_RESULT_COLUMN = ::make_shared("[applied]", false); +thread_local const ::shared_ptr modification_statement::CAS_RESULT_COLUMN = ::make_shared("[applied]", false); std::ostream& operator<<(std::ostream& out, modification_statement::statement_type t) { diff --git a/cql3/statements/modification_statement.hh b/cql3/statements/modification_statement.hh index 3575b352a3..86d0ede702 100644 --- a/cql3/statements/modification_statement.hh +++ b/cql3/statements/modification_statement.hh @@ -54,7 +54,7 @@ namespace statements { */ class modification_statement : public cql_statement { private: - static ::shared_ptr CAS_RESULT_COLUMN; + static thread_local const ::shared_ptr CAS_RESULT_COLUMN; public: enum class statement_type { INSERT, UPDATE, DELETE };