diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-03-18 15:42:58 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-03-18 15:42:58 +0100 |
| commit | 45127bba92c77033fa9b60a18075ceb9020dbc00 (patch) | |
| tree | d8317c66b260a79fc9c9019c832368f65af17056 /client | |
| parent | 160a26dafe709e9ac82ffcfa0077fa2bbf15d77f (diff) | |
| parent | c85237485a4cfe5ff87d16007503882afe77ea5d (diff) | |
| download | mariadb-git-45127bba92c77033fa9b60a18075ceb9020dbc00.tar.gz | |
upmerge 11885854
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 ffc99a3dffd..b8ca33982c7 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -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 |