Deprecate mysql_list_dbs, as mysql_list_tables is already deprecated.

As well as mysql_list

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 85831b7371dc674364f79a7da9a54325ab739400..1f2762b1913f89914cd297955a821fb2dc310803 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1575,11 +1575,13 @@ PHP_FUNCTION(mysql_list_dbs)
                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;

diff --git a/ext/mysql/tests/mysql_db_name.phpt b/ext/mysql/tests/mysql_db_name.phpt
index be4f604d9c8707c6d79b640e34b186b86a69f17c..e241bc0d9a8cdb9a154626cef6a455d100b47605 100644 (file)
--- a/ext/mysql/tests/mysql_db_name.phpt
+++ b/ext/mysql/tests/mysql_db_name.phpt
@@ -58,6 +58,8 @@ mysql_close($link);
 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

diff --git a/ext/mysql/tests/mysql_list_dbs.phpt b/ext/mysql/tests/mysql_list_dbs.phpt
index 3e12ce5501cad33e80107b13d0a48716f9f61821..e0850d5a5450afa7bf3407d1806cccded2091769 100644 (file)
--- a/ext/mysql/tests/mysql_list_dbs.phpt
+++ b/ext/mysql/tests/mysql_list_dbs.phpt
@@ -51,4 +51,7 @@ print "done!\n";
 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!