diff options
| author | Georg Richter <georg@php.net> | 2005-06-22 09:12:43 +0000 |
|---|---|---|
| committer | Georg Richter <georg@php.net> | 2005-06-22 09:12:43 +0000 |
| commit | 6fba73e8e26322f9214b225e6ca55a2a56435dd5 (patch) | |
| tree | 065528b15a0c68e7223ce6a5b58a7f29bf840b2f /ext/mysqli/php_mysqli.h | |
| parent | 372c38a53a050f19c6ebf1f5696f1ee78f0388a3 (diff) | |
| download | php-git-6fba73e8e26322f9214b225e6ca55a2a56435dd5.tar.gz | |
changed/fixed mysqli_warning class
added prefetch support for cursors
Diffstat (limited to 'ext/mysqli/php_mysqli.h')
| -rw-r--r-- | ext/mysqli/php_mysqli.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h index b37af76add..94dbd5dd81 100644 --- a/ext/mysqli/php_mysqli.h +++ b/ext/mysqli/php_mysqli.h @@ -71,12 +71,6 @@ typedef struct { void *info; /* additional buffer */ } MYSQLI_RESOURCE; -typedef struct { - MYSQL_RES *result; /* stored result set from SHOW WARNINGS */ - MYSQL_ROW row; - int warning_count; /* number of warnings */ -} MYSQLI_WARNING; - typedef struct _mysqli_object { zend_object zo; void *ptr; @@ -84,6 +78,13 @@ typedef struct _mysqli_object { HashTable *prop_handler; } mysqli_object; /* extends zend_object */ +typedef struct { + char *reason; + char sqlstate[6]; + int errorno; + void *next; +} MYSQLI_WARNING; + typedef struct _mysqli_property_entry { char *pname; int (*r_func)(mysqli_object *obj, zval **retval TSRMLS_DC); @@ -157,6 +158,7 @@ extern mysqli_property_entry mysqli_warning_property_entries[]; extern void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flag, int into_object); extern void php_clear_stmt_bind(MY_STMT *stmt); extern void php_clear_mysql(MY_MYSQL *); +extern MYSQLI_WARNING *php_get_warnings(MYSQL *mysql); extern void php_clear_warnings(MYSQLI_WARNING *w); extern void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type); extern void php_mysqli_report_error(char *sqlstate, int errorno, char *error TSRMLS_DC); @@ -359,6 +361,7 @@ PHP_FUNCTION(mysqli_get_host_info); PHP_FUNCTION(mysqli_get_proto_info); PHP_FUNCTION(mysqli_get_server_info); PHP_FUNCTION(mysqli_get_server_version); +PHP_FUNCTION(mysqli_get_warnings); PHP_FUNCTION(mysqli_info); PHP_FUNCTION(mysqli_insert_id); PHP_FUNCTION(mysqli_init); @@ -411,6 +414,7 @@ PHP_FUNCTION(mysqli_stmt_data_seek); PHP_FUNCTION(mysqli_stmt_errno); PHP_FUNCTION(mysqli_stmt_error); PHP_FUNCTION(mysqli_stmt_free_result); +PHP_FUNCTION(mysqli_stmt_get_warnings); PHP_FUNCTION(mysqli_stmt_reset); PHP_FUNCTION(mysqli_stmt_insert_id); PHP_FUNCTION(mysqli_stmt_num_rows); @@ -425,7 +429,7 @@ PHP_FUNCTION(mysqli_warning_count); ZEND_FUNCTION(mysqli_stmt_construct); ZEND_FUNCTION(mysqli_result_construct); ZEND_FUNCTION(mysqli_driver_construct); -ZEND_FUNCTION(mysqli_warning_construct); +ZEND_METHOD(mysqli_warning,__construct); ZEND_BEGIN_MODULE_GLOBALS(mysqli) long default_link; |