Client: fixes

Author: AnastasMIPT

src/Client/Connection.hpp

@@ -444,7 +444,6 @@ Connection<BUFFER, NetProvider>::execute(const std::string& statement, const T&
 }
 
 template<class BUFFER, class NetProvider>
-<<<<<<< HEAD
 template <class T>
 rid_t
 Connection<BUFFER, NetProvider>::execute(unsigned int stmt_id, const T& parameters)
@@ -455,8 +454,6 @@ Connection<BUFFER, NetProvider>::execute(unsigned int stmt_id, const T& paramete
 }
 
 template<class BUFFER, class NetProvider>
-=======
->>>>>>> fc37e11... Client: prepare()
 rid_t
 Connection<BUFFER, NetProvider>::prepare(const std::string& statement)
 {

src/Client/RequestEncoder.hpp

@@ -84,7 +84,6 @@ class RequestEncoder {
 			    IteratorType iterator = EQ);
 	template <class T>
 	size_t encodeExecute(const std::string& statement, const T& parameters);
-	size_t encodePrepare(const std::string& statement);
 	template <class T>
 	size_t encodeExecute(unsigned int stmt_id, const T& parameters);
 	size_t encodePrepare(const std::string& statement);

src/Client/ResponseReader.hpp

@@ -426,7 +426,7 @@ struct ColumnMapKeyReader : mpp::SimpleReaderBase<BUFFER, mpp::MP_UINT> {
 				break;
 			}
 			default:
-				LOG_ERROR("Invalid error key: ", key);
+				LOG_ERROR("Invalid column map key: ", key);
 				dec.AbortAndSkipRead();
 		}
 	}