cvs: php4 /ext/mysql php_mysql.c php_mysql.h

jan Fri Mar 29 07:47:03 2002 EDT Modified files: /php4/ext/mysql php_mysql.c php_mysql.h Log: - add mysql_info function Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.130 php4/ext/mysql/php_mysql.c:1.131 --- php4/ext/mysql/php_mysql.c:1.130 Mon Mar 25 07:09:38 2002 +++ php4/ext/mysql/php_mysql.c Fri Mar 29 07:47:02 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.130 2002/03/25 12:09:38 georg Exp $ */ +/* $Id: php_mysql.c,v 1.131 2002/03/29 12:47:02 jan Exp $ */ /* TODO: @@ -166,6 +166,8 @@ PHP_FE(mysql_get_proto_info, NULL) PHP_FE(mysql_get_server_info, NULL) #endif + + PHP_FE(mysql_info, NULL) /* for downwards compatability */ PHP_FALIAS(mysql, mysql_db_query, NULL) @@ -906,6 +908,34 @@ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); RETURN_STRING(mysql_get_server_info(&mysql->conn),1); +} +/* }}} */ + +/* {{{ proto string mysql_info([int link_identifier]) + Returns a string containing information about the most recent query */ +PHP_FUNCTION(mysql_info) +{ + zval **mysql_link; + int id; + char *str; + php_mysql_conn *mysql; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + return; + } + + if (ZEND_NUM_ARGS() == 0) { + id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(id); + } + + ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); + + if (str = mysql_info(&mysql->conn)) { + RETURN_STRING(str,1); + } else { + RETURN_FALSE; + } } /* }}} */ Index: php4/ext/mysql/php_mysql.h diff -u php4/ext/mysql/php_mysql.h:1.29 php4/ext/mysql/php_mysql.h:1.30 --- php4/ext/mysql/php_mysql.h:1.29 Sun Mar 24 12:34:20 2002 +++ php4/ext/mysql/php_mysql.h Fri Mar 29 07:47:02 2002 @@ -17,7 +17,7 @@ */ -/* $Id: php_mysql.h,v 1.29 2002/03/24 17:34:20 zak Exp $ */ +/* $Id: php_mysql.h,v 1.30 2002/03/29 12:47:02 jan Exp $ */ #ifndef PHP_MYSQL_H #define PHP_MYSQL_H @@ -86,6 +86,7 @@ PHP_FUNCTION(mysql_get_host_info); PHP_FUNCTION(mysql_get_proto_info); PHP_FUNCTION(mysql_get_server_info); +PHP_FUNCTION(mysql_info); PHP_FUNCTION(mysql_stat); PHP_FUNCTION(mysql_thread_id); PHP_FUNCTION(mysql_character_set_name);