diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-12-16 14:11:20 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-12-16 14:11:20 +0100 |
| commit | cb2c2fd8df18ad10792a1ccd20ac63d526786c54 (patch) | |
| tree | 3c649eaeecff14c257ff448de3de4d314e1ba4c9 /libmysql | |
| parent | 57c69db903c4307990dba33033e7297b7a0dd275 (diff) | |
| parent | 54df0057e18d8c82c23fbd4e0bf5b5dc2e762955 (diff) | |
| download | mariadb-git-cb2c2fd8df18ad10792a1ccd20ac63d526786c54.tar.gz | |
Automerge the build fixes of 5.5.0-m2 back into the tree.
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); |