summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/mysqli/mysqli_api.c4
-rw-r--r--ext/mysqli/mysqli_fe.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 41a378c369..f0b30b2c4b 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1229,7 +1229,7 @@ PHP_FUNCTION(mysqli_ping)
}
/* }}} */
-/* {{{ proto resource mysqli_prepare(object link, string query)
+/* {{{ proto mixed mysqli_prepare(object link, string query)
Prepare a SQL statement for execution */
PHP_FUNCTION(mysqli_prepare)
{
@@ -1261,7 +1261,7 @@ PHP_FUNCTION(mysqli_prepare)
}
/* }}} */
-/* {{{ proto resource mysqli_get_metadata(object stmt)
+/* {{{ proto mixed mysqli_get_metadata(object stmt)
return result set from statement */
PHP_FUNCTION(mysqli_get_metadata)
{
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index e924b15817..2a599e808f 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -218,7 +218,6 @@ function_entry mysqli_result_methods[] = {
PHP_FALIAS(fetch_row,mysqli_fetch_row,NULL)
PHP_FALIAS(field_count,mysqli_field_count,NULL)
PHP_FALIAS(field_seek,mysqli_field_seek,NULL)
- PHP_FALIAS(field_tell,mysqli_field_tell,NULL)
PHP_FALIAS(free_result,mysqli_free_result,NULL)
{NULL, NULL, NULL}
};