diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
| commit | d7c529ed327cca4fad2c42fe74fabc367f24dc5b (patch) | |
| tree | 919d9e6800c6244436ddce9d09d707922fd859a4 /ext/mysqli/mysqli_prop.c | |
| parent | 875c48ae679158cb2194c4e277810883e0b21768 (diff) | |
| parent | 211d32c81429730e2692c65577d021616a525726 (diff) | |
| download | php-git-d7c529ed327cca4fad2c42fe74fabc367f24dc5b.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
Diffstat (limited to 'ext/mysqli/mysqli_prop.c')
| -rw-r--r-- | ext/mysqli/mysqli_prop.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 2d36336372..8d28e0181f 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -216,8 +216,8 @@ static int link_error_list_read(mysqli_object *obj, zval **retval TSRMLS_DC) MAKE_STD_ZVAL(single_error); array_init(single_error); add_assoc_long_ex(single_error, "errno", sizeof("errno"), message->error_no); - add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), message->sqlstate, 1); - add_assoc_string_ex(single_error, "error", sizeof("error"), message->error, 1); + add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), message->sqlstate); + add_assoc_string_ex(single_error, "error", sizeof("error"), message->error); add_next_index_zval(*retval, single_error); } } @@ -227,8 +227,8 @@ static int link_error_list_read(mysqli_object *obj, zval **retval TSRMLS_DC) MAKE_STD_ZVAL(single_error); array_init(single_error); add_assoc_long_ex(single_error, "errno", sizeof("errno"), mysql_errno(mysql->mysql)); - add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), mysql_sqlstate(mysql->mysql), 1); - add_assoc_string_ex(single_error, "error", sizeof("error"), mysql_error(mysql->mysql), 1); + add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), mysql_sqlstate(mysql->mysql)); + add_assoc_string_ex(single_error, "error", sizeof("error"), mysql_error(mysql->mysql)); add_next_index_zval(*retval, single_error); } #endif @@ -415,8 +415,8 @@ static int stmt_error_list_read(mysqli_object *obj, zval **retval TSRMLS_DC) MAKE_STD_ZVAL(single_error); array_init(single_error); add_assoc_long_ex(single_error, "errno", sizeof("errno"), message->error_no); - add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), message->sqlstate, 1); - add_assoc_string_ex(single_error, "error", sizeof("error"), message->error, 1); + add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), message->sqlstate); + add_assoc_string_ex(single_error, "error", sizeof("error"), message->error); add_next_index_zval(*retval, single_error); } } @@ -426,8 +426,8 @@ static int stmt_error_list_read(mysqli_object *obj, zval **retval TSRMLS_DC) MAKE_STD_ZVAL(single_error); array_init(single_error); add_assoc_long_ex(single_error, "errno", sizeof("errno"), mysql_stmt_errno(stmt->stmt)); - add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), mysql_stmt_sqlstate(stmt->stmt), 1); - add_assoc_string_ex(single_error, "error", sizeof("error"), mysql_stmt_error(stmt->stmt), 1); + add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), mysql_stmt_sqlstate(stmt->stmt)); + add_assoc_string_ex(single_error, "error", sizeof("error"), mysql_stmt_error(stmt->stmt)); add_next_index_zval(*retval, single_error); } #endif |