From d265efd570608d5a262687b5c3b04947d9607d21 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Fri, 28 Dec 2007 15:38:23 +0000 Subject: Remove RPL functions. They were always experimental and lead to crashes. The underlying functions will be removed from libmysql as of MySQL 6.0, so it's right time to remove them. --- ext/mysqli/mysqli_fe.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'ext/mysqli/mysqli_fe.c') diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c index 19a0412505..6ddc43637b 100644 --- a/ext/mysqli/mysqli_fe.c +++ b/ext/mysqli/mysqli_fe.c @@ -65,18 +65,6 @@ const zend_function_entry mysqli_functions[] = { PHP_FE(mysqli_data_seek, NULL) PHP_FE(mysqli_dump_debug_info, NULL) PHP_FE(mysqli_debug, NULL) -#if !defined(HAVE_MYSQLND) - PHP_FE(mysqli_disable_reads_from_master, NULL) - PHP_FE(mysqli_disable_rpl_parse, NULL) - PHP_FE(mysqli_enable_reads_from_master, NULL) - PHP_FE(mysqli_enable_rpl_parse, NULL) - PHP_FE(mysqli_send_query, NULL) - PHP_FE(mysqli_slave_query, NULL) - PHP_FE(mysqli_master_query, NULL) - PHP_FE(mysqli_rpl_parse_enabled, NULL) - PHP_FE(mysqli_rpl_probe, NULL) - PHP_FE(mysqli_rpl_query_type, NULL) -#endif #if defined(HAVE_EMBEDDED_MYSQLI) PHP_FE(mysqli_embedded_server_end, NULL) PHP_FE(mysqli_embedded_server_start, NULL) @@ -207,17 +195,6 @@ const zend_function_entry mysqli_link_methods[] = { PHP_FALIAS(connect,mysqli_connect,NULL) PHP_FALIAS(dump_debug_info,mysqli_dump_debug_info,NULL) PHP_FALIAS(debug,mysqli_debug,NULL) -#if !defined(HAVE_MYSQLND) - PHP_FALIAS(disable_reads_from_master,mysqli_disable_reads_from_master,NULL) - PHP_FALIAS(disable_rpl_parse,mysqli_disable_rpl_parse,NULL) - PHP_FALIAS(enable_reads_from_master,mysqli_enable_reads_from_master,NULL) - PHP_FALIAS(enable_rpl_parse,mysqli_enable_rpl_parse,NULL) - PHP_FALIAS(rpl_parse_enabled,mysqli_rpl_parse_enabled,NULL) - PHP_FALIAS(rpl_probe,mysqli_rpl_probe,NULL) - PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL) - PHP_FALIAS(master_query,mysqli_master_query,NULL) - PHP_FALIAS(slave_query,mysqli_slave_query,NULL) -#endif #ifdef HAVE_MYSQLI_GET_CHARSET PHP_FALIAS(get_charset,mysqli_get_charset,NULL) #endif -- cgit v1.2.1