diff options
Diffstat (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h')
| -rw-r--r-- | ext/pdo_mysql/php_pdo_mysql_int.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 553437829e..6077ce8245 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -39,7 +39,7 @@ typedef _Bool my_bool; #define PDO_DBG_INF_FMT(...) do { if (dbg_skip_trace == FALSE) PDO_MYSQL_G(dbg)->m->log_va(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "info : ", __VA_ARGS__); } while (0) #define PDO_DBG_ERR_FMT(...) do { if (dbg_skip_trace == FALSE) PDO_MYSQL_G(dbg)->m->log_va(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "error: ", __VA_ARGS__); } while (0) #define PDO_DBG_ENTER(func_name) \ - zend_bool dbg_skip_trace = TRUE; \ + bool dbg_skip_trace = TRUE; \ ((void) dbg_skip_trace); \ if (PDO_MYSQL_G(dbg)) \ dbg_skip_trace = !PDO_MYSQL_G(dbg)->m->func_enter(PDO_MYSQL_G(dbg), __LINE__, __FILE__, func_name, strlen(func_name)); @@ -120,12 +120,6 @@ typedef struct { pdo_mysql_db_handle *H; MYSQL_RES *result; const MYSQL_FIELD *fields; - MYSQL_ROW current_data; -#ifdef PDO_USE_MYSQLND - const size_t *current_lengths; -#else - unsigned long *current_lengths; -#endif pdo_mysql_error_info einfo; #ifdef PDO_USE_MYSQLND MYSQLND_STMT *stmt; @@ -137,10 +131,14 @@ typedef struct { #ifndef PDO_USE_MYSQLND my_bool *in_null; zend_ulong *in_length; -#endif PDO_MYSQL_PARAM_BIND *bound_result; my_bool *out_null; zend_ulong *out_length; + MYSQL_ROW current_data; + unsigned long *current_lengths; +#else + zval *current_row; +#endif unsigned max_length:1; /* Whether all result sets have been fully consumed. * If this flag is not set, they need to be consumed during destruction. */ @@ -180,6 +178,9 @@ enum { #ifdef PDO_USE_MYSQLND PDO_MYSQL_ATTR_SSL_VERIFY_SERVER_CERT, #endif +#if MYSQL_VERSION_ID >= 80021 || defined(PDO_USE_MYSQLND) + PDO_MYSQL_ATTR_LOCAL_INFILE_DIRECTORY, +#endif }; #endif |