diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-12-16 16:20:08 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-12-16 16:20:08 +0100 |
| commit | 95199266d3b27b4599b136383f1eec309dcd196b (patch) | |
| tree | 44687e1e015ccde9dacb1bac98d643d5c786a7e3 /libmysql | |
| parent | b3d99069077cd24e1cf4bb07857fdb12aee895a0 (diff) | |
| parent | cb2c2fd8df18ad10792a1ccd20ac63d526786c54 (diff) | |
| download | mariadb-git-95199266d3b27b4599b136383f1eec309dcd196b.tar.gz | |
Automerge the changes of version 5.5.0-m2.
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); |