mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
upmerge 11885854
This commit is contained in:
commit
dd8574288c
1 changed files with 5 additions and 3 deletions
|
@ -8334,13 +8334,15 @@ int main(int argc, char **argv)
|
|||
}
|
||||
var_set_string("MYSQLTEST_FILE", cur_file->file_name);
|
||||
init_re();
|
||||
|
||||
/* Cursor protcol implies ps protocol */
|
||||
if (cursor_protocol)
|
||||
ps_protocol= 1;
|
||||
|
||||
ps_protocol_enabled= ps_protocol;
|
||||
sp_protocol_enabled= sp_protocol;
|
||||
view_protocol_enabled= view_protocol;
|
||||
cursor_protocol_enabled= cursor_protocol;
|
||||
/* Cursor protcol implies ps protocol */
|
||||
if (cursor_protocol_enabled)
|
||||
ps_protocol_enabled= 1;
|
||||
|
||||
st_connection *con= connections;
|
||||
#ifdef EMBEDDED_LIBRARY
|
||||
|
|
Loading…
Reference in a new issue