diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-25 16:22:25 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-25 16:22:25 +0300 |
| commit | c3eabe01fc30ee38f64b17fabfd58c6328751660 (patch) | |
| tree | 5262fcad41adee5cc85c726ef0ed77413772f685 /libmysql | |
| parent | 387cb3c99b4a13ca9fa41c0af44e933f997b5348 (diff) | |
| parent | 10eab6ccb0210f238e6a21a0f25899c804717653 (diff) | |
| download | mariadb-git-c3eabe01fc30ee38f64b17fabfd58c6328751660.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/client_settings.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index aaec08d1b1e..fa92dfb2687 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -27,8 +27,7 @@ extern char * mysql_unix_port; CLIENT_TRANSACTIONS | \ CLIENT_PROTOCOL_41 | \ CLIENT_SECURE_CONNECTION | \ - CLIENT_MULTI_RESULTS | \ - CLIENT_PS_MULTI_RESULTS) + CLIENT_MULTI_RESULTS) sig_handler my_pipe_sig_handler(int sig); void read_user_name(char *name); |