diff options
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rwxr-xr-x | ext/pdo_mysql/mysql_driver.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 39a22f164..650b832d9 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql_driver.c,v 1.59.2.13 2006/04/09 08:11:31 wez Exp $ */ +/* $Id: mysql_driver.c,v 1.59.2.13.2.1 2006/10/02 22:09:49 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -379,6 +379,34 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, long attr, zval *return_value return 1; } +static int pdo_mysql_check_liveness(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */ +{ + pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data; +#if MYSQL_VERSION_ID <= 32230 + void (*handler) (int); + unsigned int my_errno; +#endif + +#if MYSQL_VERSION_ID > 32230 + if (mysql_ping(H->server)) { + return FAILURE; + } +#else /* no mysql_ping() */ + handler=signal(SIGPIPE, SIG_IGN); + mysql_stat(H->server); + switch (mysql_errno(H->server)) { + case CR_SERVER_GONE_ERROR: + /* case CR_SERVER_LOST: I'm not sure this means the same as "gone" for us */ + signal(SIGPIPE, handler); + return FAILURE; + default: + break; + } + signal(SIGPIPE, handler); +#endif /* end mysql_ping() */ + return SUCCESS; +} +/* }}} */ static struct pdo_dbh_methods mysql_methods = { mysql_handle_closer, @@ -392,7 +420,7 @@ static struct pdo_dbh_methods mysql_methods = { pdo_mysql_last_insert_id, pdo_mysql_fetch_error_func, pdo_mysql_get_attribute, - NULL /* check_liveness: TODO: ping */ + pdo_mysql_check_liveness }; #ifndef PDO_MYSQL_UNIX_ADDR |