mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
manual merge
libmysqld/lib_sql.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_prepare.cc: merge
This commit is contained in:
@@ -301,9 +301,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();
|
||||
|
||||
Reference in New Issue
Block a user