summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Richter <georg@php.net>2003-02-13 00:11:17 +0000
committerGeorg Richter <georg@php.net>2003-02-13 00:11:17 +0000
commit44559a18f97c16ac7ebc23f5519cbf4bd2774ffe (patch)
tree29da390e30f7eaa9f38a6e8260049eb0e1cc8369
parentef086ad82db148867913894bc66ca4990b11151a (diff)
downloadphp-git-44559a18f97c16ac7ebc23f5519cbf4bd2774ffe.tar.gz
added new function int mysql_get_server_version
this function is available since libmysql change set 1.1450 (2002-02-13)
-rw-r--r--ext/mysqli/mysqli_api.c17
-rw-r--r--ext/mysqli/mysqli_fe.c2
-rw-r--r--ext/mysqli/php_mysqli.h1
3 files changed, 20 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 8efee2e66b..dd10e38e5b 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -948,6 +948,23 @@ PHP_FUNCTION(mysqli_get_server_info)
/* }}} */
+/* {{{ proto int mysqli_get_server_version
+*/
+PHP_FUNCTION(mysqli_get_server_version)
+{
+ MYSQL *mysql;
+ zval *mysql_link = NULL;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link");
+
+ RETURN_LONG(mysql_get_server_version(mysql));
+}
+
+/* }}} */
+
/* {{{ proto string mysqli_info(resource link)
*/
PHP_FUNCTION(mysqli_info)
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index 7c4f524d04..4d7651d970 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -73,6 +73,7 @@ function_entry mysqli_functions[] = {
PHP_FE(mysqli_get_host_info, NULL)
PHP_FE(mysqli_get_proto_info, NULL)
PHP_FE(mysqli_get_server_info, NULL)
+ PHP_FE(mysqli_get_server_version, NULL)
PHP_FE(mysqli_init, NULL)
PHP_FE(mysqli_info, NULL)
PHP_FE(mysqli_insert_id, NULL)
@@ -141,6 +142,7 @@ function_entry mysqli_link_methods[] = {
PHP_FALIAS(get_host_info,mysqli_get_host_info,NULL)
PHP_FALIAS(get_proto_info,mysqli_get_proto_info,NULL)
PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL)
+ PHP_FALIAS(get_server_version,mysqli_get_server_version,NULL)
PHP_FALIAS(init,mysqli_init,NULL)
PHP_FALIAS(info,mysqli_info,NULL)
PHP_FALIAS(insert_id,mysqli_insert_id,NULL)
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index 9c4a0edd05..01301f573d 100644
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -179,6 +179,7 @@ PHP_FUNCTION(mysqli_get_client_info);
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_info);
PHP_FUNCTION(mysqli_insert_id);
PHP_FUNCTION(mysqli_init);