Update with PHP_DEF_FE, also update the test

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 85831b7371dc674364f79a7da9a54325ab739400..32d840c17efe89307a0cf51596f08f767b94fc70 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -251,7 +251,7 @@ static const zend_function_entry mysql_functions[] = {
 #endif /* NETWARE */
        PHP_FE(mysql_query,                                                                     arginfo_mysql_query)
        PHP_FE(mysql_unbuffered_query,                                          arginfo_mysql_query)
-       PHP_FE(mysql_db_query,                                                          arginfo_mysql_db_query)
+       PHP_DEP_FE(mysql_db_query,                                                      arginfo_mysql_db_query)
        PHP_FE(mysql_list_dbs,                                                          arginfo__optional_mysql_link)
        PHP_DEP_FE(mysql_list_tables,                                           arginfo_mysql_select_db)
        PHP_FE(mysql_list_fields,                                                       arginfo_mysql_list_fields)

diff --git a/ext/mysql/tests/mysql_trace_mode.phpt b/ext/mysql/tests/mysql_trace_mode.phpt
index 622f413062dbf5c9ca26d9c89816f39fa7aeea40..6d163d40f755485d6e0f1cf5e73fd8e61d930a7a 100644 (file)
--- a/ext/mysql/tests/mysql_trace_mode.phpt
+++ b/ext/mysql/tests/mysql_trace_mode.phpt
@@ -29,6 +29,8 @@ print "done!\n";
 require_once("clean_table.inc");
 ?>
 --EXPECTF--
+Deprecated: Function mysql_db_query() is deprecated in %s on line %d
+
 Deprecated: mysql_db_query(): %s
 
 Deprecated: mysql_escape_string(): %s