andrey Mon Mar 10 09:18:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli php_mysqli_structs.h
Log:
- Fix a warning in php_mysql.c
- Fixed #44371 Extension compile failed
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.13&r2=1.213.2.6.2.16.2.14&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.13
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.14
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.13 Sat Mar 8 15:00:50 2008
+++ php-src/ext/mysql/php_mysql.c Mon Mar 10 09:18:43 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.13 2008/03/08 15:00:50 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.14 2008/03/10 09:18:43 andrey Exp $ */
/* TODO:
*
@@ -673,7 +673,7 @@
client_flags ^= CLIENT_LOCAL_FILES;
}
- hashed_details_length = spprintf(&hashed_details, 0,
"mysql_%s_%s_%s_%d", SAFE_STRING(host_and_port), SAFE_STRING(user),
SAFE_STRING(passwd), client_flags);
+ hashed_details_length = spprintf(&hashed_details, 0,
"mysql_%s_%s_%s_%ld", SAFE_STRING(host_and_port), SAFE_STRING(user),
SAFE_STRING(passwd), client_flags);
}
/* We cannot use mysql_port anymore in windows, need to use
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli_structs.h?r1=1.4.2.10&r2=1.4.2.11&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.10
php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.11
--- php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.10 Sat Mar 8 14:55:52 2008
+++ php-src/ext/mysqli/php_mysqli_structs.h Mon Mar 10 09:18:43 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli_structs.h,v 1.4.2.10 2008/03/08 14:55:52 andrey Exp $
+ $Id: php_mysqli_structs.h,v 1.4.2.11 2008/03/10 09:18:43 andrey Exp $
*/
#ifndef PHP_MYSQLI_STRUCTS_H
@@ -38,11 +38,11 @@
#ifdef HAVE_MYSQLND
#include "ext/mysqlnd/mysqlnd.h"
-#include "ext/mysqli/mysqli_mysqlnd.h"
+#include "mysqli_mysqlnd.h"
#else
#include <mysql.h>
#include <errmsg.h>
-#include "ext/mysqli/mysqli_libmysql.h"
+#include "mysqli_libmysql.h"
#endif
#include "php_mysqli.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
