andrey          Fri Dec 28 15:37:52 2007 UTC

  Removed files:               (Branch: PHP_5_3)
    /php-src/ext/mysqli mysqli_repl.c 
    /php-src/ext/mysqli/tests   mysqli_disable_rpl_parse.phpt 
                                mysqli_enable_rpl_parse.phpt 
                                mysqli_rpl_parse_enabled.phpt 
                                mysqli_rpl_probe.phpt 
                                mysqli_rpl_query_type.phpt 

  Modified files:              
    /php-src/ext/mysqli config.m4 config.w32 mysqli_fe.c 
                        php_mysqli_structs.h 
    /php-src/ext/mysqli/tests   connect.inc 
                                mysqli_class_mysqli_interface.phpt 
  Log:
  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.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.m4?r1=1.22.2.1.2.2.2.2&r2=1.22.2.1.2.2.2.3&diff_format=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.22.2.1.2.2.2.2 
php-src/ext/mysqli/config.m4:1.22.2.1.2.2.2.3
--- php-src/ext/mysqli/config.m4:1.22.2.1.2.2.2.2       Tue Nov  6 10:00:39 2007
+++ php-src/ext/mysqli/config.m4        Fri Dec 28 15:37:52 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.22.2.1.2.2.2.2 2007/11/06 10:00:39 jani Exp $
+dnl $Id: config.m4,v 1.22.2.1.2.2.2.3 2007/12/28 15:37:52 andrey Exp $
 dnl config.m4 for extension mysqli
 
 PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -61,8 +61,6 @@
   ],[
     $MYSQLI_LIBLINE
   ])
-
-  mysqli_extra_sources="$mysqli_extra_sources mysqli_repl.c"
 fi
 
 dnl Build extension
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.w32?r1=1.7.6.1&r2=1.7.6.2&diff_format=u
Index: php-src/ext/mysqli/config.w32
diff -u php-src/ext/mysqli/config.w32:1.7.6.1 
php-src/ext/mysqli/config.w32:1.7.6.2
--- php-src/ext/mysqli/config.w32:1.7.6.1       Fri Oct  5 21:23:56 2007
+++ php-src/ext/mysqli/config.w32       Fri Dec 28 15:37:52 2007
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7.6.1 2007/10/05 21:23:56 andrey Exp $
+// $Id: config.w32,v 1.7.6.2 2007/12/28 15:37:52 andrey Exp $
 // vim:ft=javascript
 
 // Note: The extension name is "mysqli", you enable it with "--with-mysqli".
@@ -26,9 +26,7 @@
                        CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", 
PHP_MYSQLI + 
                                                                                
"\\include;" + PHP_PHP_BUILD +
                                                                                
"\\include\\mysql;" + PHP_MYSQLI)) {
-                       // No "mysqli_repl.c" when using "mysqlnd"
-                       mysqli_extra_sources = "mysqli_repl.c";
-                       EXTENSION("mysqli", mysqli_source + " " + 
mysqli_extra_sources);
+                       EXTENSION("mysqli", mysqli_source);
                        AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
                } else {
                        WARNING("mysqli not enabled; libraries and headers not 
found");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.49.2.5.2.1.2.2&r2=1.49.2.5.2.1.2.3&diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.2 
php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.3
--- php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.2     Fri Oct  5 21:23:56 2007
+++ php-src/ext/mysqli/mysqli_fe.c      Fri Dec 28 15:37:52 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.2 2007/10/05 21:23:56 andrey Exp $ 
+  $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.3 2007/12/28 15:37:52 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -63,18 +63,6 @@
        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)
@@ -205,17 +193,6 @@
        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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli_structs.h?r1=1.4.2.4&r2=1.4.2.5&diff_format=u
Index: php-src/ext/mysqli/php_mysqli_structs.h
diff -u php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.4 
php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.5
--- php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.4     Fri Nov  9 10:56:28 2007
+++ php-src/ext/mysqli/php_mysqli_structs.h     Fri Dec 28 15:37:52 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: php_mysqli_structs.h,v 1.4.2.4 2007/11/09 10:56:28 andrey Exp $ 
+  $Id: php_mysqli_structs.h,v 1.4.2.5 2007/12/28 15:37:52 andrey Exp $ 
 */
 
 #ifndef PHP_MYSQLI_STRUCTS_H
@@ -400,11 +400,7 @@
 PHP_FUNCTION(mysqli_connect_error);
 PHP_FUNCTION(mysqli_data_seek);
 PHP_FUNCTION(mysqli_debug);
-PHP_FUNCTION(mysqli_disable_reads_from_master);
-PHP_FUNCTION(mysqli_disable_rpl_parse);
 PHP_FUNCTION(mysqli_dump_debug_info);
-PHP_FUNCTION(mysqli_enable_reads_from_master);
-PHP_FUNCTION(mysqli_enable_rpl_parse);
 PHP_FUNCTION(mysqli_errno);
 PHP_FUNCTION(mysqli_error);
 PHP_FUNCTION(mysqli_fetch_all);
@@ -437,7 +433,6 @@
 PHP_FUNCTION(mysqli_kill);
 PHP_FUNCTION(mysqli_set_local_infile_default);
 PHP_FUNCTION(mysqli_set_local_infile_handler);
-PHP_FUNCTION(mysqli_master_query);
 PHP_FUNCTION(mysqli_more_results);
 PHP_FUNCTION(mysqli_multi_query);
 PHP_FUNCTION(mysqli_next_result);
@@ -455,9 +450,6 @@
 PHP_FUNCTION(mysqli_real_escape_string);
 PHP_FUNCTION(mysqli_rollback);
 PHP_FUNCTION(mysqli_row_seek);
-PHP_FUNCTION(mysqli_rpl_parse_enabled);
-PHP_FUNCTION(mysqli_rpl_probe);
-PHP_FUNCTION(mysqli_rpl_query_type);
 PHP_FUNCTION(mysqli_select_db);
 PHP_FUNCTION(mysqli_stmt_attr_get);
 PHP_FUNCTION(mysqli_stmt_attr_set);
@@ -470,10 +462,8 @@
 PHP_FUNCTION(mysqli_stmt_fetch);
 PHP_FUNCTION(mysqli_stmt_param_count);
 PHP_FUNCTION(mysqli_stmt_send_long_data);
-PHP_FUNCTION(mysqli_send_query);
 PHP_FUNCTION(mysqli_embedded_server_end);
 PHP_FUNCTION(mysqli_embedded_server_start);
-PHP_FUNCTION(mysqli_slave_query);
 PHP_FUNCTION(mysqli_sqlstate);
 PHP_FUNCTION(mysqli_ssl_set);
 PHP_FUNCTION(mysqli_stat);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/connect.inc?r1=1.6.2.1.2.2.2.2&r2=1.6.2.1.2.2.2.3&diff_format=u
Index: php-src/ext/mysqli/tests/connect.inc
diff -u php-src/ext/mysqli/tests/connect.inc:1.6.2.1.2.2.2.2 
php-src/ext/mysqli/tests/connect.inc:1.6.2.1.2.2.2.3
--- php-src/ext/mysqli/tests/connect.inc:1.6.2.1.2.2.2.2        Fri Oct 12 
12:06:07 2007
+++ php-src/ext/mysqli/tests/connect.inc        Fri Dec 28 15:37:52 2007
@@ -52,4 +52,4 @@
                        return FALSE;
                }
        }
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
diff -u php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt:1.2.2.2 
php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt:1.2.2.3
--- php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt:1.2.2.2 Wed Oct 
10 10:13:46 2007
+++ php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt Fri Dec 28 
15:37:52 2007
@@ -62,33 +62,6 @@
                $expected_methods['get_connection_stats']       = true;
        } else {
                // libmysql only
-               if (function_exists('mysqli_disable_reads_from_master'))
-                       $expected_methods['disable_reads_from_master']  = true;
-
-               if (function_exists('mysqli_disable_rpl_parse'))
-                       $expected_methods['disable_rpl_parse'] = true;
-
-               if (function_exists('mysqli_enable_reads_from_master'))
-                       $expected_methods['enable_reads_from_master'] = true;
-
-               if (function_exists('mysqli_enable_rpl_parse'))
-                       $expected_methods['enable_rpl_parse'] = true;
-
-               if (function_exists('mysqli_master_query'))
-                       $expected_methods['master_query'] = true;
-
-               if (function_exists('mysqli_rpl_parse_enabled'))
-                       $expected_methods['rpl_parse_enabled'] = true;
-
-               if (function_exists('mysqli_rpl_probe'))
-                       $expected_methods['rpl_probe'] = true;
-
-               if (function_exists('mysqli_rpl_query_type'))
-                       $expected_methods['rpl_query_type'] = true;
-
-               if (function_exists('mysqli_slave_query'))
-                       $expected_methods['slave_query'] = true;
-
                if (function_exists('mysqli_ssl_set'))
                        $expected_methods['ssl_set'] = true;
                $expected_methods['set_local_infile_default']   = true;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to