From b13e715581fb7ced41bc19e16638ab677d82e973 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 3 Dec 2013 11:44:18 +0100 Subject: basic fixes to ext/pdo_mysql --- ext/pdo_mysql/php_pdo_mysql_int.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h') diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 24f7aa2182..1ece5d0797 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -122,9 +122,9 @@ typedef struct { const MYSQL_FIELD *fields; MYSQL_ROW current_data; #if PDO_USE_MYSQLND - unsigned long *current_lengths; + php_uint_t *current_lengths; #else - long *current_lengths; + php_int_t *current_lengths; #endif pdo_mysql_error_info einfo; #if PDO_USE_MYSQLND @@ -136,11 +136,11 @@ typedef struct { PDO_MYSQL_PARAM_BIND *params; #ifndef PDO_USE_MYSQLND my_bool *in_null; - unsigned long *in_length; + php_uint_t *in_length; #endif PDO_MYSQL_PARAM_BIND *bound_result; my_bool *out_null; - unsigned long *out_length; + php_uint_t *out_length; unsigned int params_given; unsigned max_length:1; } pdo_mysql_stmt; -- cgit v1.2.1 From 2a468115e335679fabd565624e585588c040b5b8 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 9 Jan 2014 04:18:37 +0100 Subject: revamp mysqlnd, mysqli, mysql and pdo_mysql --- ext/pdo_mysql/php_pdo_mysql_int.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h') diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 477218d3b9..66178263c3 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -92,7 +92,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql) typedef struct { const char *file; int line; - unsigned int errcode; + php_uint_t errcode; char *errmsg; } pdo_mysql_error_info; @@ -132,7 +132,7 @@ typedef struct { #else MYSQL_STMT *stmt; #endif - int num_params; + php_uint_t num_params; PDO_MYSQL_PARAM_BIND *params; #ifndef PDO_USE_MYSQLND my_bool *in_null; @@ -142,12 +142,12 @@ typedef struct { my_bool *out_null; php_uint_t *out_length; unsigned int params_given; - unsigned max_length:1; + php_size_t max_length:1; } pdo_mysql_stmt; extern pdo_driver_t pdo_mysql_driver; -extern int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC); +extern php_uint_t _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC); #define pdo_mysql_error(s) _pdo_mysql_error(s, NULL, __FILE__, __LINE__ TSRMLS_CC) #define pdo_mysql_error_stmt(s) _pdo_mysql_error(stmt->dbh, stmt, __FILE__, __LINE__ TSRMLS_CC) -- cgit v1.2.1 From 4ed156d4df70acf0aa81dc75fceea1837157665f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 19:02:07 +0200 Subject: ported from pdo - pgsql, odbc, mysql, firebirt, dblib --- ext/pdo_mysql/php_pdo_mysql_int.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h') diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 4455dcbeb6..e6fc079466 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -122,9 +122,9 @@ typedef struct { const MYSQL_FIELD *fields; MYSQL_ROW current_data; #if PDO_USE_MYSQLND - unsigned long *current_lengths; + php_uint_t *current_lengths; #else - long *current_lengths; + php_int_t *current_lengths; #endif pdo_mysql_error_info einfo; #if PDO_USE_MYSQLND @@ -136,11 +136,11 @@ typedef struct { PDO_MYSQL_PARAM_BIND *params; #ifndef PDO_USE_MYSQLND my_bool *in_null; - unsigned long *in_length; + php_uint_t *in_length; #endif PDO_MYSQL_PARAM_BIND *bound_result; my_bool *out_null; - unsigned long *out_length; + php_uint_t *out_length; unsigned int params_given; unsigned max_length:1; } pdo_mysql_stmt; -- cgit v1.2.1 From eb1871b3fb63f48216f20663f0cc479d322e3970 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 21 Aug 2014 09:54:40 +0200 Subject: yet trivial fixes to mysql exts --- ext/pdo_mysql/php_pdo_mysql_int.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h') diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index e6fc079466..fe2d216a5f 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -106,7 +106,7 @@ typedef struct { unsigned fetch_table_names:1; unsigned _reserved:31; #if !PDO_USE_MYSQLND - unsigned long max_buffer_size; + php_uint_t max_buffer_size; #endif pdo_mysql_error_info einfo; -- cgit v1.2.1