diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_structs.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_structs.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index c178df9b5b..93c91c38d5 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -62,8 +62,8 @@ typedef struct st_mysqlnd_upsert_result { unsigned int warning_count; unsigned int server_status; - mynd_ulonglong affected_rows; - mynd_ulonglong last_insert_id; + uint64 affected_rows; + uint64 last_insert_id; } mysqlnd_upsert_status; @@ -177,7 +177,7 @@ typedef enum_func_status (*mysqlnd_fetch_row_func)(MYSQLND_RES *result, typedef struct st_mysqlnd_stats { - my_uint64 values[STAT_LAST]; + uint64 values[STAT_LAST]; #ifdef ZTS MUTEX_T LOCK_access; #endif @@ -223,7 +223,7 @@ struct st_mysqlnd_conn_methods unsigned int (*get_error_no)(const MYSQLND * const conn); const char * (*get_error_str)(const MYSQLND * const conn); const char * (*get_sqlstate)(const MYSQLND * const conn); - mynd_ulonglong (*get_thread_id)(const MYSQLND * const conn); + uint64 (*get_thread_id)(const MYSQLND * const conn); void (*get_statistics)(const MYSQLND * const conn, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); unsigned long (*get_server_version)(const MYSQLND * const conn); @@ -236,8 +236,8 @@ struct st_mysqlnd_conn_methods MYSQLND_RES * (*list_fields)(MYSQLND *conn, const char *table, const char *achtung_wild TSRMLS_DC); MYSQLND_RES * (*list_method)(MYSQLND *conn, const char *query, const char *achtung_wild, char *par1 TSRMLS_DC); - mynd_ulonglong (*get_last_insert_id)(const MYSQLND * const conn); - mynd_ulonglong (*get_affected_rows)(const MYSQLND * const conn); + uint64 (*get_last_insert_id)(const MYSQLND * const conn); + uint64 (*get_affected_rows)(const MYSQLND * const conn); unsigned int (*get_warning_count)(const MYSQLND * const conn); unsigned int (*get_field_count)(const MYSQLND * const conn); @@ -264,10 +264,10 @@ struct st_mysqlnd_res_methods void (*fetch_into)(MYSQLND_RES *result, unsigned int flags, zval *return_value, enum_mysqlnd_extension ext TSRMLS_DC ZEND_FILE_LINE_DC); void (*fetch_all)(MYSQLND_RES *result, unsigned int flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); void (*fetch_field_data)(MYSQLND_RES *result, unsigned int offset, zval *return_value TSRMLS_DC); - mynd_ulonglong (*num_rows)(const MYSQLND_RES * const result); + uint64 (*num_rows)(const MYSQLND_RES * const result); unsigned int (*num_fields)(const MYSQLND_RES * const result); enum_func_status (*skip_result)(MYSQLND_RES * const result TSRMLS_DC); - enum_func_status (*seek_data)(MYSQLND_RES * result, mynd_ulonglong row TSRMLS_DC); + enum_func_status (*seek_data)(MYSQLND_RES * result, uint64 row TSRMLS_DC); MYSQLND_FIELD_OFFSET (*seek_field)(MYSQLND_RES * const result, MYSQLND_FIELD_OFFSET field_offset); MYSQLND_FIELD_OFFSET (*field_tell)(const MYSQLND_RES * const result); MYSQLND_FIELD * (*fetch_field)(MYSQLND_RES * const result TSRMLS_DC); @@ -301,7 +301,7 @@ struct st_mysqlnd_stmt_methods MYSQLND_RES * (*store_result)(MYSQLND_STMT * const stmt TSRMLS_DC); MYSQLND_RES * (*get_result)(MYSQLND_STMT * const stmt TSRMLS_DC); enum_func_status (*free_result)(MYSQLND_STMT * const stmt TSRMLS_DC); - enum_func_status (*seek_data)(const MYSQLND_STMT * const stmt, mynd_ulonglong row TSRMLS_DC); + enum_func_status (*seek_data)(const MYSQLND_STMT * const stmt, uint64 row TSRMLS_DC); enum_func_status (*reset)(MYSQLND_STMT * const stmt TSRMLS_DC); enum_func_status (*close)(MYSQLND_STMT * const stmt, zend_bool implicit TSRMLS_DC); /* private */ enum_func_status (*dtor)(MYSQLND_STMT * const stmt, zend_bool implicit TSRMLS_DC); /* use this for mysqlnd_stmt_close */ @@ -315,9 +315,9 @@ struct st_mysqlnd_stmt_methods MYSQLND_RES * (*get_parameter_metadata)(MYSQLND_STMT * const stmt); MYSQLND_RES * (*get_result_metadata)(MYSQLND_STMT * const stmt TSRMLS_DC); - mynd_ulonglong (*get_last_insert_id)(const MYSQLND_STMT * const stmt); - mynd_ulonglong (*get_affected_rows)(const MYSQLND_STMT * const stmt); - mynd_ulonglong (*get_num_rows)(const MYSQLND_STMT * const stmt); + uint64 (*get_last_insert_id)(const MYSQLND_STMT * const stmt); + uint64 (*get_affected_rows)(const MYSQLND_STMT * const stmt); + uint64 (*get_num_rows)(const MYSQLND_STMT * const stmt); unsigned int (*get_param_count)(const MYSQLND_STMT * const stmt); unsigned int (*get_field_count)(const MYSQLND_STMT * const stmt); @@ -344,7 +344,7 @@ struct st_mysqlnd_connection char *passwd; unsigned int *passwd_len; char *scheme; - mynd_ulonglong thread_id; + uint64 thread_id; char *server_version; char *host_info; unsigned char *scramble; @@ -440,7 +440,7 @@ struct st_mysqlnd_buffered_result zval ***data; zval ***data_cursor; zend_uchar **row_buffers; - mynd_ulonglong row_count; + uint64 row_count; zend_bool persistent; MYSQLND_QCACHE *qcache; @@ -457,7 +457,7 @@ struct st_mysqlnd_unbuffered_result zval **last_row_data; zend_uchar *last_row_buffer; - mynd_ulonglong row_count; + uint64 row_count; zend_bool eof_reached; }; |