summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
-rw-r--r--ext/mysqli/mysqli_api.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 8282361bf2..ac23dde850 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -439,7 +439,7 @@ PHP_FUNCTION(mysqli_data_seek)
RETURN_FALSE;
}
- if (!offset || offset >= result->row_count) {
+ if (offset < 0 || offset >= result->row_count) {
RETURN_FALSE;
}
@@ -914,7 +914,7 @@ PHP_FUNCTION(mysqli_field_tell)
}
/* }}} */
-/* {{{ proto int mysqli_free_result(object result)
+/* {{{ proto void mysqli_free_result(object result)
Free query result memory for the given result handle */
PHP_FUNCTION(mysqli_free_result)
{
@@ -929,7 +929,7 @@ PHP_FUNCTION(mysqli_free_result)
mysql_free_result(result);
MYSQLI_CLEAR_RESOURCE(&mysql_result);
- RETURN_TRUE;
+ return;
}
/* }}} */
@@ -941,6 +941,14 @@ PHP_FUNCTION(mysqli_get_client_info)
}
/* }}} */
+/* {{{ proto int mysqli_get_client_version(void)
+ Get MySQL client info */
+PHP_FUNCTION(mysqli_get_client_version)
+{
+ RETURN_LONG((long)mysql_get_client_version());
+}
+/* }}} */
+
/* {{{ proto string mysqli_get_host_info (object link)
Get MySQL host info */
PHP_FUNCTION(mysqli_get_host_info)