diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-03-18 12:13:54 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-03-18 12:13:54 +0100 |
| commit | c85237485a4cfe5ff87d16007503882afe77ea5d (patch) | |
| tree | 63f0f145bf24e442e05f4d4753038f8fe79b6350 /client | |
| parent | ebba068d26115f6d65ca12163bb771b56003edd5 (diff) | |
| download | mariadb-git-c85237485a4cfe5ff87d16007503882afe77ea5d.tar.gz | |
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
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index a94dba90979..52c76b8c68e 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -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))) |