diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2016-07-03 22:42:10 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2016-07-03 22:42:10 -0500 |
| commit | d9a9cf8ecaef891b2369969e9efe9f6261359158 (patch) | |
| tree | 04bcc83b3c9be1924007e007e1f508f7229af7ab /ext/pdo_mysql/mysql_driver.c | |
| parent | 583386d59e6b362fe49e51594718a109d0c0cc2f (diff) | |
| parent | c2b29a58bc0916e248ba2584564558097b16b51f (diff) | |
| download | php-git-d9a9cf8ecaef891b2369969e9efe9f6261359158.tar.gz | |
Merge branch 'master' into iterable
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 1b1d1abbea..de898262d4 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -523,7 +523,10 @@ static struct pdo_dbh_methods mysql_methods = { pdo_mysql_last_insert_id, pdo_mysql_fetch_error_func, pdo_mysql_get_attribute, - pdo_mysql_check_liveness + pdo_mysql_check_liveness, + NULL, + NULL, + NULL }; /* }}} */ @@ -537,7 +540,8 @@ static struct pdo_dbh_methods mysql_methods = { static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) { pdo_mysql_db_handle *H; - int i, ret = 0; + size_t i; + int ret = 0; char *host = NULL, *unix_socket = NULL; unsigned int port = 3306; char *dbname; |