summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorguilhem@gbichot3.local <>2007-01-30 22:48:05 +0100
committerguilhem@gbichot3.local <>2007-01-30 22:48:05 +0100
commitbe389f62de783d1e1a82ca0f6d37083301f6005f (patch)
tree882f9a64d2c25aaf2e3c29ae0c6c167806bb794a /sql/set_var.cc
parent04a994580e5872b706d9634ec9b2a6cdf820f000 (diff)
downloadmariadb-git-be389f62de783d1e1a82ca0f6d37083301f6005f.tar.gz
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.
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc4
1 files changed, 2 insertions, 2 deletions
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;
}