andrey Tue, 17 Aug 2010 15:37:44 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302392
Log:
Deprecate mysql_list_dbs, as mysql_list_tables is already deprecated.
As well as mysql_list
Changed paths:
U php/php-src/trunk/ext/mysql/php_mysql.c
U php/php-src/trunk/ext/mysql/tests/mysql_db_name.phpt
U php/php-src/trunk/ext/mysql/tests/mysql_list_dbs.phpt
Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/trunk/ext/mysql/php_mysql.c 2010-08-17 15:15:35 UTC (rev
302391)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2010-08-17 15:37:44 UTC (rev
302392)
@@ -1575,11 +1575,13 @@
id =
php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
}
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is
deprecated; use mysql_query() with SHOW DATABASES instead");
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id,
"MySQL-Link", le_link, le_plink);
PHPMY_UNBUFFERED_QUERY_CHECK();
+
if ((mysql_result=mysql_list_dbs(mysql->conn, NULL))==NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save
MySQL query result");
RETURN_FALSE;
Modified: php/php-src/trunk/ext/mysql/tests/mysql_db_name.phpt
===================================================================
--- php/php-src/trunk/ext/mysql/tests/mysql_db_name.phpt 2010-08-17
15:15:35 UTC (rev 302391)
+++ php/php-src/trunk/ext/mysql/tests/mysql_db_name.phpt 2010-08-17
15:37:44 UTC (rev 302392)
@@ -58,6 +58,8 @@
print "done!\n";
?>
--EXPECTF--
+Deprecated: mysql_list_dbs(): This function is deprecated; use mysql_query()
with SHOW DATABASES instead in %s on line %d
+
Warning: mysql_db_name(): Unable to jump to row -1 on MySQL result index %d in
%s on line %d
Warning: mysql_db_name(): Unable to jump to row %d on MySQL result index %d in
%s on line %d
Modified: php/php-src/trunk/ext/mysql/tests/mysql_list_dbs.phpt
===================================================================
--- php/php-src/trunk/ext/mysql/tests/mysql_list_dbs.phpt 2010-08-17
15:15:35 UTC (rev 302391)
+++ php/php-src/trunk/ext/mysql/tests/mysql_list_dbs.phpt 2010-08-17
15:37:44 UTC (rev 302392)
@@ -51,4 +51,7 @@
require_once("clean_table.inc");
?>
--EXPECTF--
+Deprecated: mysql_list_dbs(): This function is deprecated; use mysql_query()
with SHOW DATABASES instead in %s on line %d
+
+Deprecated: mysql_list_dbs(): This function is deprecated; use mysql_query()
with SHOW DATABASES instead in %s on line %d
done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
