Bug #11885854 MYSQLTEST: PS-PROTOCOL IMPLIED BY CURSOR-PROTOCOL LOST AFTER ENABLE_PS_PROTOCOL

The condition cursor-protocol => ps-protocol was done at "current setting" level"
Moved it to "set by command line" level
This commit is contained in:
Bjorn Munch 2011-03-18 12:13:54 +01:00
parent ebba068d26
commit c85237485a

View file

@ -8032,13 +8032,15 @@ int main(int argc, char **argv)
cur_file->lineno= 1;
}
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;
if (!( mysql_init(&con->mysql)))