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

1 files changed, 6 insertions, 6 deletions

diff --git a/sql/protocol.h b/sql/protocol.h
index 0e00a7c21e0..b75ce38dc37 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -101,11 +101,11 @@ public:
 
 /* Class used for the old (MySQL 4.0 protocol) */
 
-class Protocol_simple :public Protocol
+class Protocol_text :public Protocol
 {
 public:
-  Protocol_simple() {}
-  Protocol_simple(THD *thd_arg) :Protocol(thd_arg) {}
+  Protocol_text() {}
+  Protocol_text(THD *thd_arg) :Protocol(thd_arg) {}
   virtual void prepare_for_resend();
   virtual bool store_null();
   virtual bool store_tiny(longlong from);
@@ -128,13 +128,13 @@ public:
 };
 
 
-class Protocol_prep :public Protocol
+class Protocol_binary :public Protocol
 {
 private:
   uint bit_fields;
 public:
-  Protocol_prep() {}
-  Protocol_prep(THD *thd_arg) :Protocol(thd_arg) {}
+  Protocol_binary() {}
+  Protocol_binary(THD *thd_arg) :Protocol(thd_arg) {}
   virtual bool prepare_for_send(List<Item> *item_list);
   virtual void prepare_for_resend();
 #ifdef EMBEDDED_LIBRARY