subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_3\) \/ext\/mysql config.w32"

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql config.w32 /ext/mysqli config.w32

2008-04-08 Thread Andrey Hristov

andrey  Tue Apr  8 07:45:49 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysql  config.w32 
/php-src/ext/mysqli config.w32 
  Log:
  Fix snapshot build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.2.6.4r2=1.2.6.5diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.2.6.4 
php-src/ext/mysql/config.w32:1.2.6.5
--- php-src/ext/mysql/config.w32:1.2.6.4Mon Mar 10 20:15:38 2008
+++ php-src/ext/mysql/config.w32Tue Apr  8 07:45:49 2008
@@ -1,22 +1,24 @@
-// $Id: config.w32,v 1.2.6.4 2008/03/10 20:15:38 andrey Exp $
+// $Id: config.w32,v 1.2.6.5 2008/04/08 07:45:49 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH(mysql, MySQL support, no);
 
 if (PHP_MYSQL != no) {
-   if (PHP_MYSQL != mysqlnd) {
+   if (PHP_MYSQL == yes || PHP_MYSQL == mysqlnd) {
+   AC_DEFINE('MYSQL_USE_MYSQLND', 1, 'Using MySQL native driver');
+   ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
+   EXTENSION(mysql, php_mysql.c);
+   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
+   STDOUT.WriteLine(INFO: mysqlnd build);
+   } else if (PHP_MYSQL != ) {
if (CHECK_LIB(libmysql.lib, mysql, PHP_MYSQL) 
CHECK_HEADER_ADD_INCLUDE(mysql.h, CFLAGS_MYSQL,
PHP_MYSQL + \\include; + PHP_PHP_BUILD + 
\\include\\mysql; + PHP_MYSQL)) {
EXTENSION(mysql, php_mysql.c);
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
+   STDOUT.WriteLine(INFO: libmysql build);
} else {
WARNING(mysql not enabled; libraries and headers not 
found);
}
-   } else {
-   AC_DEFINE('MYSQL_USE_MYSQLND', 1, 'MySQL native driver support 
enabled');
-   ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
-   EXTENSION(mysql, php_mysql.c);
-   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
}
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.w32?r1=1.7.6.3r2=1.7.6.4diff_format=u
Index: php-src/ext/mysqli/config.w32
diff -u php-src/ext/mysqli/config.w32:1.7.6.3 
php-src/ext/mysqli/config.w32:1.7.6.4
--- php-src/ext/mysqli/config.w32:1.7.6.3   Mon Mar 10 20:15:38 2008
+++ php-src/ext/mysqli/config.w32   Tue Apr  8 07:45:49 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7.6.3 2008/03/10 20:15:38 andrey Exp $
+// $Id: config.w32,v 1.7.6.4 2008/04/08 07:45:49 andrey Exp $
 // vim:ft=javascript
 
 // Note: The extension name is mysqli, you enable it with --with-mysqli.
@@ -21,20 +21,22 @@
mysqli_report.c  +
mysqli_warning.c;
 
-   if (PHP_MYSQLI != mysqlnd) {
+   if (PHP_MYSQLI == yes || PHP_MYSQLI == mysqlnd) {
+   EXTENSION(mysqli, mysqli_source);
+   AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'Using MySQL native driver');
+   AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+   ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
+   STDOUT.WriteLine(INFO: mysqlnd build);
+   } else {
if (CHECK_LIB(libmysql.lib, mysqli, PHP_MYSQLI) 
CHECK_HEADER_ADD_INCLUDE(mysql.h, CFLAGS_MYSQLI, 
PHP_MYSQLI + 

\\include; + PHP_PHP_BUILD +

\\include\\mysql; + PHP_MYSQLI)) {
EXTENSION(mysqli, mysqli_source);
AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+   STDOUT.WriteLine(INFO: libmysql build);
} else {
WARNING(mysqli not enabled; libraries and headers not 
found);
}
-   } else {
-   EXTENSION(mysqli, mysqli_source);
-   AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'MySQLi with native driver 
support enabled');
-   AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
-   ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
}
 }



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql config.w32 /ext/mysqli/tests mysqli_get_client_stats.phpt /ext/mysqlnd config.w32 config9.m4 mysqlnd.c mysqlnd_block_alloc.c mysqlnd_block_alloc.h mysqlnd_

2008-01-28 Thread Andrey Hristov

andrey  Mon Jan 28 22:50:06 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_block_alloc.c mysqlnd_block_alloc.h 

  Modified files:  
/php-src/ext/mysql  config.w32 
/php-src/ext/mysqli/tests   mysqli_get_client_stats.phpt 
/php-src/ext/mysqlndconfig.w32 config9.m4 mysqlnd.c mysqlnd_priv.h 
mysqlnd_ps.c mysqlnd_result.c 
mysqlnd_structs.h mysqlnd_wireprotocol.c 
  Log:
  some config.w32 fixes
  moved mysqlnd's block allocator to a separate file and also now
  it's part of the connection, no MT problems.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.2.6.2r2=1.2.6.3diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.2.6.2 
php-src/ext/mysql/config.w32:1.2.6.3
--- php-src/ext/mysql/config.w32:1.2.6.2Sat Jan 19 18:21:44 2008
+++ php-src/ext/mysql/config.w32Mon Jan 28 22:50:06 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2.6.2 2008/01/19 18:21:44 andrey Exp $
+// $Id: config.w32,v 1.2.6.3 2008/01/28 22:50:06 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH(mysql, MySQL support, no);
@@ -8,13 +8,15 @@
if (CHECK_LIB(libmysql.lib, mysql, PHP_MYSQL) 
CHECK_HEADER_ADD_INCLUDE(mysql.h, CFLAGS_MYSQL,
PHP_MYSQL + \\include; + PHP_PHP_BUILD + 
\\include\\mysql; + PHP_MYSQL)) {
+   EXTENSION(mysql, php_mysql.c);
+   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
} else {
WARNING(mysql not enabled; libraries and headers not 
found);
}
} else {
AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support 
enabled');
ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
+   EXTENSION(mysql, php_mysql.c);
+   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
}
-   EXTENSION(mysql, php_mysql.c);
-   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.2.2.3 
php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.2.2.4
--- php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.2.2.3   Mon Jan 
28 18:25:50 2008
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt   Mon Jan 28 
22:50:06 2008
@@ -969,9 +969,9 @@
   [mem_efree_count]=
   string(1) 0
   [mem_malloc_count]=
-  string(1) 1
+  string(1) 0
   [mem_malloc_ammount]=
-  string(%d) %d
+  string(1) 0
   [mem_calloc_count]=
   string(1) 0
   [mem_calloc_ammount]=
@@ -1106,9 +1106,9 @@
   [umem_efree_count]=
   unicode(1) 0
   [umem_malloc_count]=
-  unicode(1) 1
+  unicode(1) 0
   [umem_malloc_ammount]=
-  unicode(%d) %d
+  unicode(1) 0
   [umem_calloc_count]=
   unicode(1) 0
   [umem_calloc_ammount]=
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.4.2.3r2=1.4.2.4diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.4.2.3 
php-src/ext/mysqlnd/config.w32:1.4.2.4
--- php-src/ext/mysqlnd/config.w32:1.4.2.3  Wed Jan 23 19:11:28 2008
+++ php-src/ext/mysqlnd/config.w32  Mon Jan 28 22:50:06 2008
@@ -1,15 +1,12 @@
-// $Id: config.w32,v 1.4.2.3 2008/01/23 19:11:28 andrey Exp $
+// $Id: config.w32,v 1.4.2.4 2008/01/28 22:50:06 andrey Exp $
 // vim:ft=javascript
 
-ARG_WITH(mysqlnd, MySQL-nd support, no);
-
-if (PHP_MYSQLND != no) {
-mysqld_source = ;
 if (CHECK_LIB(ws2_32.lib, mysqlnd)) {
mysqlnd_source = 
mysqlnd.c  +
-   mysqlnd_debug.c  +
+   mysqlnd_block_alloc.c +
mysqlnd_charset.c  +
+   mysqlnd_debug.c  +
mysqlnd_loaddata.c  +
mysqlnd_palloc.c  +
mysqlnd_ps.c  +
@@ -21,4 +18,3 @@
mysqlnd_wireprotocol.c;
EXTENSION(mysqlnd, mysqlnd_source, false);
 }
-}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config9.m4?r1=1.3.2.3r2=1.3.2.4diff_format=u
Index: php-src/ext/mysqlnd/config9.m4
diff -u php-src/ext/mysqlnd/config9.m4:1.3.2.3 
php-src/ext/mysqlnd/config9.m4:1.3.2.4
--- php-src/ext/mysqlnd/config9.m4:1.3.2.3  Wed Jan 23 19:11:28 2008
+++ php-src/ext/mysqlnd/config9.m4  Mon Jan 28 22:50:06 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.3.2.3 2008/01/23 19:11:28 andrey Exp $
+dnl $Id: config9.m4,v 1.3.2.4 2008/01/28 22:50:06 andrey Exp $
 dnl config.m4 for mysqlnd driver
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
@@ -7,7 +7,8 @@
   mysqlnd_sources=mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql config.w32

2008-01-19 Thread Andrey Hristov

andrey  Sat Jan 19 18:21:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysql  config.w32 
  Log:
  Fix compile issue
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.2.6.1r2=1.2.6.2diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.2.6.1 
php-src/ext/mysql/config.w32:1.2.6.2
--- php-src/ext/mysql/config.w32:1.2.6.1Fri Oct  5 21:23:55 2007
+++ php-src/ext/mysql/config.w32Sat Jan 19 18:21:44 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.2.6.1 2007/10/05 21:23:55 andrey Exp $
+// $Id: config.w32,v 1.2.6.2 2008/01/19 18:21:44 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH(mysql, MySQL support, no);
 
 if (PHP_MYSQL != no) {
-   if (PHP_MYSQLI != mysqlnd) {
+   if (PHP_MYSQL != mysqlnd) {
if (CHECK_LIB(libmysql.lib, mysql, PHP_MYSQL) 
CHECK_HEADER_ADD_INCLUDE(mysql.h, CFLAGS_MYSQL,
PHP_MYSQL + \\include; + PHP_PHP_BUILD + 
\\include\\mysql; + PHP_MYSQL)) {

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql config.w32 /ext/mysqli config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql config.w32 /ext/mysqli/tests mysqli_get_client_stats.phpt /ext/mysqlnd config.w32 config9.m4 mysqlnd.c mysqlnd_block_alloc.c mysqlnd_block_alloc.h mysqlnd_

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql config.w32

3 matches

Site Navigation

Mail list logo

Footer information