From 7f028f6b03dc9bb01a2a631dfb1def842be35b30 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 30 Jan 2007 22:48:05 +0100 Subject: Mechanical class renaming: Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary and also THD::protocol_simple->THD::protocol_text, THD::protocol_prep->THD::protocol_binary. Reason: the binary protocol is not bound to be used only with prepared statements long term (see WL#3559 "Decouple binary protocol from prepared statements"). Renaming now is pressing because the fix for BUG#735 "Prepared Statements: there is no support for Query Cache" will introduce a new member in class Query_cache_flags telling about the protocol's nature. Other reason: "simple" is less accurate than "text". Future patches for BUG#735 will rely on this cset. libmysqld/lib_sql.cc: Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary sql/protocol.cc: Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary sql/protocol.h: Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary sql/set_var.cc: Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary sql/sql_class.cc: Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary sql/sql_class.h: Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary sql/sql_prepare.cc: Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary --- sql/sql_class.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/sql_class.h') diff --git a/sql/sql_class.h b/sql/sql_class.h index 588d936fd57..e73806d75fa 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -853,8 +853,8 @@ public: NET net; // client connection descriptor MEM_ROOT warn_root; // For warnings and errors Protocol *protocol; // Current protocol - Protocol_simple protocol_simple; // Normal protocol - Protocol_prep protocol_prep; // Binary protocol + Protocol_text protocol_text; // Normal protocol + Protocol_binary protocol_binary; // Binary protocol HASH user_vars; // hash for user variables String packet; // dynamic buffer for network I/O String convert_buffer; // buffer for charset conversions -- cgit v1.2.1