From be389f62de783d1e1a82ca0f6d37083301f6005f Mon Sep 17 00:00:00 2001
From: "guilhem@gbichot3.local" <>
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.

---
 sql/set_var.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/set_var.cc')

diff --git a/sql/set_var.cc b/sql/set_var.cc
index 1f079eee0c6..55a3970b54e 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -2730,8 +2730,8 @@ int set_var_collation_client::update(THD *thd)
   thd->variables.character_set_results= character_set_results;
   thd->variables.collation_connection= collation_connection;
   thd->update_charset();
-  thd->protocol_simple.init(thd);
-  thd->protocol_prep.init(thd);
+  thd->protocol_text.init(thd);
+  thd->protocol_binary.init(thd);
   return 0;
 }
 
-- 
cgit v1.2.1