diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-02-21 22:15:44 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-02-21 22:15:44 +0100 |
| commit | f6b68a10707c95e24f67d338eaaa03f1bd575598 (patch) | |
| tree | bd7748f0d0a239145e4c02b223f523b4c571aacb /include/mysql_com.h | |
| parent | 4b9907979ce316be12a7ce2b62874b42edf2e39e (diff) | |
| parent | 7c8ebb532eef543a9b98107c164a12a49e28d0ca (diff) | |
| download | mariadb-git-f6b68a10707c95e24f67d338eaaa03f1bd575598.tar.gz | |
Merge MWL#192: Non-blocking client library, into MariaDB 5.5.
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 171b5eb0463..b35e8961bbb 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -187,6 +187,15 @@ enum enum_server_command #define CLIENT_PROGRESS (1UL << 29) /* Client support progress indicator */ #define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30) +/* + It used to be that if mysql_real_connect() failed, it would delete any + options set by the client, unless the CLIENT_REMEMBER_OPTIONS flag was + given. + That behaviour does not appear very useful, and it seems unlikely that + any applications would actually depend on this. So from MariaDB 5.5 we + always preserve any options set in case of failed connect, and this + option is effectively always set. +*/ #define CLIENT_REMEMBER_OPTIONS (1UL << 31) #ifdef HAVE_COMPRESS |