diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
| commit | 40271e4f5edacc6fe90ed74a087e5ff25daea899 (patch) | |
| tree | d38210df12297fa40d9edbf59cbb72329a4ccad4 /libmysql/client_settings.h | |
| parent | 0ae23cd69d3c13dba2a73750e93abf3342f21eb4 (diff) | |
| parent | 33c075e842324cfdf0aab055c2db8d0d50bcbc68 (diff) | |
| download | mariadb-git-40271e4f5edacc6fe90ed74a087e5ff25daea899.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_plugin.cc
Diffstat (limited to 'libmysql/client_settings.h')
| -rw-r--r-- | libmysql/client_settings.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index fa92dfb2687..aaec08d1b1e 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -27,7 +27,8 @@ extern char * mysql_unix_port; CLIENT_TRANSACTIONS | \ CLIENT_PROTOCOL_41 | \ CLIENT_SECURE_CONNECTION | \ - CLIENT_MULTI_RESULTS) + CLIENT_MULTI_RESULTS | \ + CLIENT_PS_MULTI_RESULTS) sig_handler my_pipe_sig_handler(int sig); void read_user_name(char *name); |