diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-03-22 01:04:39 +0100 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-03-22 01:04:39 +0100 |
| commit | b636ad25c7cb672ec8559ff61cc19a0cee83fb05 (patch) | |
| tree | 34885ae893c0a3acb95069f2687f5e289554a05c /sql/sql_class.cc | |
| parent | 9e6d54e4a5ddf0aae5b23a9b51507e7bb6b5d5f5 (diff) | |
| parent | 8ed9a54008fae160d63dc27fa02b9ae4348238e7 (diff) | |
| download | mariadb-git-b636ad25c7cb672ec8559ff61cc19a0cee83fb05.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/help.result:
Auto merged
mysql-test/t/help.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 39a2219a691..d8371bef446 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -303,9 +303,9 @@ THD::THD() bzero((char*) &user_var_events, sizeof(user_var_events)); /* Protocol */ - protocol= &protocol_simple; // Default protocol - protocol_simple.init(this); - protocol_prep.init(this); + protocol= &protocol_text; // Default protocol + protocol_text.init(this); + protocol_binary.init(this); tablespace_op=FALSE; tmp= sql_rnd_with_mutex(); |