Skip to content

Commit 8600c1b

Browse files
committed
Deprecate mysql_list_dbs, as mysql_list_tables is already deprecated.
As well as mysql_list
1 parent 0655d34 commit 8600c1b

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

ext/mysql/php_mysql.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,11 +1575,13 @@ PHP_FUNCTION(mysql_list_dbs)
15751575
id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
15761576
CHECK_LINK(id);
15771577
}
1578+
php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated; use mysql_query() with SHOW DATABASES instead");
15781579

15791580
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink);
15801581

15811582
PHPMY_UNBUFFERED_QUERY_CHECK();
15821583

1584+
15831585
if ((mysql_result=mysql_list_dbs(mysql->conn, NULL))==NULL) {
15841586
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save MySQL query result");
15851587
RETURN_FALSE;

ext/mysql/tests/mysql_db_name.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ mysql_close($link);
5858
print "done!\n";
5959
?>
6060
--EXPECTF--
61+
Deprecated: mysql_list_dbs(): This function is deprecated; use mysql_query() with SHOW DATABASES instead in %s on line %d
62+
6163
Warning: mysql_db_name(): Unable to jump to row -1 on MySQL result index %d in %s on line %d
6264

6365
Warning: mysql_db_name(): Unable to jump to row %d on MySQL result index %d in %s on line %d

ext/mysql/tests/mysql_list_dbs.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,7 @@ print "done!\n";
5151
require_once("clean_table.inc");
5252
?>
5353
--EXPECTF--
54+
Deprecated: mysql_list_dbs(): This function is deprecated; use mysql_query() with SHOW DATABASES instead in %s on line %d
55+
56+
Deprecated: mysql_list_dbs(): This function is deprecated; use mysql_query() with SHOW DATABASES instead in %s on line %d
5457
done!

0 commit comments

Comments
 (0)