diff options
| author | Wez Furlong <wez@php.net> | 2004-09-23 20:43:11 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2004-09-23 20:43:11 +0000 |
| commit | 72040f7f2a4c38db6eca1a6a1dc9e40e70934fbe (patch) | |
| tree | fb2cbdbcdfb332450352025a7caa0ed0210e48a5 | |
| parent | b42c14f07edfa6eba0c113cacb42ad2ba7c65b7c (diff) | |
| download | php-git-72040f7f2a4c38db6eca1a6a1dc9e40e70934fbe.tar.gz | |
more method table adjustments.
mysql driver needs work with the error message stuff.
Other drivers need a bit more auditing...
| -rw-r--r-- | ext/pdo_firebird/firebird_driver.c | 1 | ||||
| -rwxr-xr-x | ext/pdo_mysql/mysql_driver.c | 2 | ||||
| -rwxr-xr-x | ext/pdo_oci/oci_driver.c | 2 | ||||
| -rwxr-xr-x | ext/pdo_odbc/odbc_driver.c | 1 | ||||
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 3 |
5 files changed, 7 insertions, 2 deletions
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index 251e80ef5f..f34b8247f9 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -582,6 +582,7 @@ static struct pdo_dbh_methods firebird_methods = { /* {{{ */ NULL, /* last_id not supported */ pdo_firebird_fetch_error_func, firebird_handle_get_attribute, + NULL /* check_liveness */ }; /* }}} */ diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 783a6c7e63..bbad743862 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -152,7 +152,7 @@ static int mysql_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */ efree(H->einfo.errmsg); H->einfo.errmsg = NULL; } - efree(H); + pefree(H, dbh->is_persistent); dbh->driver_data = NULL; } return 0; diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c index 0793a32e7a..353ccf3ed2 100755 --- a/ext/pdo_oci/oci_driver.c +++ b/ext/pdo_oci/oci_driver.c @@ -346,6 +346,8 @@ static struct pdo_dbh_methods oci_methods = { oci_handle_set_attribute, NULL, pdo_oci_fetch_error_func, + NULL, /* get_attr */ + NULL /* check_liveness */ }; static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC) /* {{{ */ diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c index e3d557bb00..83d4342ce0 100755 --- a/ext/pdo_odbc/odbc_driver.c +++ b/ext/pdo_odbc/odbc_driver.c @@ -299,6 +299,7 @@ static struct pdo_dbh_methods odbc_methods = { NULL, /* last id */ pdo_odbc_fetch_error_func, NULL, /* get attr */ + NULL, /* check_liveness */ }; static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC) /* {{{ */ diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index f30b39ecc8..af8497e721 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -310,7 +310,8 @@ static struct pdo_dbh_methods pgsql_methods = { NULL, pdo_pgsql_last_insert_id, pdo_pgsql_fetch_error_func, - pdo_pgsql_get_attribute + pdo_pgsql_get_attribute, + NULL /* check_liveness */ }; static int pdo_pgsql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC) /* {{{ */ |