andrey Mon May 5 12:30:39 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/mysqli mysqli.c mysqli_fe.c mysqli_repl.c php_mysqli.h
Log:
Fix build with libmysql 6.0.x
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1149&r2=1.2027.2.547.2.1150&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1149 php-src/NEWS:1.2027.2.547.2.1150
--- php-src/NEWS:1.2027.2.547.2.1149 Sun May 4 15:26:25 2008
+++ php-src/NEWS Mon May 5 12:30:38 2008
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2008, PHP 5.2.7
+- Fixed build failure of ext/mysqli with libmysql 6.0 - missing rpl
+ functions. (Andrey)
- Fixed bug #44891 Memory leak using registerPHPFunctions and XSLT Variable
as function parameter. (Rob)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.25&r2=1.72.2.16.2.26&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.25
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.26
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.25 Sat Mar 8 14:59:37 2008
+++ php-src/ext/mysqli/mysqli.c Mon May 5 12:30:38 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.25 2008/03/08 14:59:37 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.26 2008/05/05 12:30:38 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -639,11 +639,13 @@
REGISTER_LONG_CONSTANT("MYSQLI_SET_CHARSET_NAME",
MYSQL_SET_CHARSET_NAME, CONST_CS | CONST_PERSISTENT);
+#ifdef HAVE_LIBMYSQL_REPLICATION
/* replication */
REGISTER_LONG_CONSTANT("MYSQLI_RPL_MASTER", MYSQL_RPL_MASTER, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_RPL_SLAVE", MYSQL_RPL_SLAVE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_RPL_ADMIN", MYSQL_RPL_ADMIN, CONST_CS |
CONST_PERSISTENT);
-
+#endif
+
/* bind support */
REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS |
CONST_PERSISTENT);
#ifdef MYSQL_DATA_TRUNCATED
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.49.2.5.2.2&r2=1.49.2.5.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.2
php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.3
--- php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.2 Mon Dec 31 07:20:08 2007
+++ php-src/ext/mysqli/mysqli_fe.c Mon May 5 12:30:38 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.49.2.5.2.2 2007/12/31 07:20:08 sebastian Exp $
+ $Id: mysqli_fe.c,v 1.49.2.5.2.3 2008/05/05 12:30:38 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -62,11 +62,15 @@
PHP_FE(mysqli_connect_error,
NULL)
PHP_FE(mysqli_data_seek,
NULL)
PHP_FE(mysqli_debug,
NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
PHP_FE(mysqli_disable_reads_from_master, NULL)
PHP_FE(mysqli_disable_rpl_parse,
NULL)
+#endif
PHP_FE(mysqli_dump_debug_info,
NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
PHP_FE(mysqli_enable_reads_from_master, NULL)
PHP_FE(mysqli_enable_rpl_parse,
NULL)
+#endif
PHP_FE(mysqli_embedded_server_end,
NULL)
PHP_FE(mysqli_embedded_server_start, NULL)
PHP_FE(mysqli_errno,
NULL)
@@ -101,7 +105,9 @@
PHP_FE(mysqli_kill,
NULL)
PHP_FE(mysqli_set_local_infile_default, NULL)
PHP_FE(mysqli_set_local_infile_handler, NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
PHP_FE(mysqli_master_query,
NULL)
+#endif
PHP_FE(mysqli_more_results,
NULL)
PHP_FE(mysqli_multi_query,
NULL)
PHP_FE(mysqli_next_result,
NULL)
@@ -116,9 +122,11 @@
PHP_FE(mysqli_real_escape_string,
NULL)
PHP_FE(mysqli_real_query,
NULL)
PHP_FE(mysqli_rollback,
NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
PHP_FE(mysqli_rpl_parse_enabled,
NULL)
PHP_FE(mysqli_rpl_probe,
NULL)
PHP_FE(mysqli_rpl_query_type,
NULL)
+#endif
PHP_FE(mysqli_select_db,
NULL)
#ifdef HAVE_MYSQLI_SET_CHARSET
PHP_FE(mysqli_set_charset,
NULL)
@@ -138,8 +146,10 @@
PHP_FE(mysqli_stmt_insert_id,
NULL)
PHP_FE(mysqli_stmt_reset,
NULL)
PHP_FE(mysqli_stmt_param_count,
NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
PHP_FE(mysqli_send_query,
NULL)
PHP_FE(mysqli_slave_query,
NULL)
+#endif
PHP_FE(mysqli_sqlstate,
NULL)
PHP_FE(mysqli_ssl_set,
NULL)
PHP_FE(mysqli_stat,
NULL)
@@ -185,11 +195,15 @@
PHP_FALIAS(commit,mysqli_commit,NULL)
PHP_FALIAS(connect,mysqli_connect,NULL)
PHP_FALIAS(debug,mysqli_debug,NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
PHP_FALIAS(disable_reads_from_master,mysqli_disable_reads_from_master,NULL)
PHP_FALIAS(disable_rpl_parse,mysqli_disable_rpl_parse,NULL)
+#endif
PHP_FALIAS(dump_debug_info,mysqli_dump_debug_info,NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
PHP_FALIAS(enable_reads_from_master,mysqli_enable_reads_from_master,NULL)
PHP_FALIAS(enable_rpl_parse,mysqli_enable_rpl_parse,NULL)
+#endif
#ifdef HAVE_MYSQLI_GET_CHARSET
PHP_FALIAS(get_charset,mysqli_get_charset,NULL)
#endif
@@ -200,7 +214,9 @@
PHP_FALIAS(kill,mysqli_kill,NULL)
PHP_FALIAS(set_local_infile_default,mysqli_set_local_infile_default,NULL)
PHP_FALIAS(set_local_infile_handler,mysqli_set_local_infile_handler,NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
PHP_FALIAS(master_query,mysqli_master_query,NULL)
+#endif
PHP_FALIAS(multi_query,mysqli_multi_query,NULL)
PHP_FALIAS(mysqli,mysqli_connect,NULL)
PHP_FALIAS(more_results,mysqli_more_results, NULL)
@@ -214,15 +230,20 @@
PHP_FALIAS(escape_string, mysqli_real_escape_string,NULL)
PHP_FALIAS(real_query,mysqli_real_query,NULL)
PHP_FALIAS(rollback,mysqli_rollback,NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
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)
+#endif
PHP_FALIAS(select_db,mysqli_select_db,NULL)
#ifdef HAVE_MYSQLI_SET_CHARSET
PHP_FALIAS(set_charset,mysqli_set_charset,NULL)
#endif
PHP_FALIAS(set_opt, mysqli_options,NULL)
+#ifdef HAVE_LIBMYSQL_REPLICATION
+ PHP_FALIAS(send_query,mysqli_send_query,NULL)
PHP_FALIAS(slave_query,mysqli_slave_query,NULL)
+#endif
PHP_FALIAS(ssl_set,mysqli_ssl_set,NULL)
PHP_FALIAS(stat,mysqli_stat,NULL)
PHP_FALIAS(stmt_init,mysqli_stmt_init, NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_repl.c?r1=1.3.2.2.2.2&r2=1.3.2.2.2.3&diff_format=u
Index: php-src/ext/mysqli/mysqli_repl.c
diff -u php-src/ext/mysqli/mysqli_repl.c:1.3.2.2.2.2
php-src/ext/mysqli/mysqli_repl.c:1.3.2.2.2.3
--- php-src/ext/mysqli/mysqli_repl.c:1.3.2.2.2.2 Mon Dec 31 07:20:08 2007
+++ php-src/ext/mysqli/mysqli_repl.c Mon May 5 12:30:38 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_repl.c,v 1.3.2.2.2.2 2007/12/31 07:20:08 sebastian Exp $
+ $Id: mysqli_repl.c,v 1.3.2.2.2.3 2008/05/05 12:30:38 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -29,6 +29,7 @@
#include "ext/standard/info.h"
#include "php_mysqli.h"
+#ifdef HAVE_LIBMYSQL_REPLICATION
/* {{{ proto void mysqli_disable_reads_from_master(object link)
*/
PHP_FUNCTION(mysqli_disable_reads_from_master)
@@ -211,6 +212,8 @@
}
/* }}} */
+#endif /* HAVE_LIBMYSQL_REPLICATION */
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli.h?r1=1.54.2.7.2.7&r2=1.54.2.7.2.8&diff_format=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.7
php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.8
--- php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.7 Mon Dec 31 07:20:08 2007
+++ php-src/ext/mysqli/php_mysqli.h Mon May 5 12:30:38 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.54.2.7.2.7 2007/12/31 07:20:08 sebastian Exp $
+ $Id: php_mysqli.h,v 1.54.2.7.2.8 2008/05/05 12:30:38 andrey Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -301,6 +301,11 @@
php_mysqli_report_error(stmt->sqlstate, stmt->last_errno,
stmt->last_error TSRMLS_CC); \
}
+#if MYSQL_VERSION_ID > 32300 && MYSQL_VERSION_ID < 60000
+#define HAVE_LIBMYSQL_REPLICATION
+#endif
+
+
PHP_MYSQLI_API void mysqli_register_link(zval *return_value, void *link
TSRMLS_DC);
PHP_MYSQLI_API void mysqli_register_stmt(zval *return_value, void *stmt
TSRMLS_DC);
PHP_MYSQLI_API void mysqli_register_result(zval *return_value, void *result
TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
