diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:34:04 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:34:04 +0300 |
| commit | 6bb8cd842981f3ccdfc08e3cbd0d702fc956c314 (patch) | |
| tree | d30367a92b28d997a8fdc75abf6e00cd78d5ea3c /libmysql | |
| parent | af74c3436f5ba44606dc3ffcf501001711ed06d0 (diff) | |
| parent | 9721437edf2037d040fe34dffd87cac1eba30dde (diff) | |
| download | mariadb-git-6bb8cd842981f3ccdfc08e3cbd0d702fc956c314.tar.gz | |
Auto-merge from mysql-trunk.
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); |