diff options
Diffstat (limited to 'ext/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 15 | ||||
| -rw-r--r-- | ext/pdo_mysql/pdo_mysql.c | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/php_pdo_mysql_int.h | 6 |
3 files changed, 10 insertions, 13 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index f09bc05314..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; @@ -630,12 +634,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) } #ifndef PDO_USE_MYSQLND -#if PHP_API_VERSION < 20100412 - if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') || PG(safe_mode)) -#else - if (PG(open_basedir) && PG(open_basedir)[0] != '\0') -#endif - { + if (PG(open_basedir) && PG(open_basedir)[0] != '\0') { local_infile = 0; } #endif diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 7ed1647d8a..fdf7062f62 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -229,7 +229,6 @@ const zend_function_entry pdo_mysql_functions[] = { /* }}} */ /* {{{ pdo_mysql_deps[] */ -#if ZEND_MODULE_API_NO >= 20050922 static const zend_module_dep pdo_mysql_deps[] = { ZEND_MOD_REQUIRED("pdo") #ifdef PDO_USE_MYSQLND @@ -237,7 +236,6 @@ static const zend_module_dep pdo_mysql_deps[] = { #endif ZEND_MOD_END }; -#endif /* }}} */ /* {{{ pdo_mysql_module_entry */ diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index a4290fdaf3..20d640c405 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -126,9 +126,9 @@ typedef struct { const MYSQL_FIELD *fields; MYSQL_ROW current_data; #if PDO_USE_MYSQLND - zend_ulong *current_lengths; + const size_t *current_lengths; #else - zend_long *current_lengths; + zend_long *current_lengths; #endif pdo_mysql_error_info einfo; #if PDO_USE_MYSQLND @@ -144,7 +144,7 @@ typedef struct { #endif PDO_MYSQL_PARAM_BIND *bound_result; my_bool *out_null; - zend_ulong *out_length; + zend_ulong *out_length; unsigned int params_given; unsigned max_length:1; } pdo_mysql_stmt; |