Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2011-10-07 Thread Ferenc Kovacs
2011/9/19 Johannes Schlüter johan...@schlueters.de:
 On Mon, 2011-09-19 at 12:25 +0200, Ferenc Kovacs wrote:
 
  Good point, are you proposing to change code and make libmysql 5.0+ a
  requirement? If so, several changes should be made to ext/mysql, ext/mysqli
  and PDO_MySQL.
 

 I think that it is your call, but yes, I think it would reasonable,
 and it would make our/your work much easier if we would have to
 support fewer major versions.

 While we can't change requirements in bug fix versions (5.3.x) and not
 sure this is a good thing to do during beta (5.4)

from other POV: beta is the last time to make such changes.
but as I said, it is your call.

-- 
Ferenc Kovács
@Tyr43l - http://tyrael.hu

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



Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2011-09-19 Thread Ulf Wendel

Am 17.09.2011 05:12, schrieb Xinchen Hui:

laruence Sat, 17 Sep 2011 03:12:23 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=316895

Log:
Fix Bug #55703(PHP crash when calling mysqli_fetch_fields)
Since the catalog values always is def now, see 
http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html

Bug: https://bugs.php.net/55703 (Duplicate) PHP crash when calling 
mysqli_fetch_fields


Ideally, you would wait for a libmysql fix, after the fix add a version 
change and revert. What if libmysql decides to set a value in the 
future? What about people who still use MySQL 4.1.0 ?


Ulf

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



Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2011-09-19 Thread Laruence
Hi:
   hmm, maybe we can revert this change after a libmysql fixed version?

thanks

2011/9/19 Ulf Wendel ulf.wen...@oracle.com:
 Am 17.09.2011 05:12, schrieb Xinchen Hui:

 laruence                                 Sat, 17 Sep 2011 03:12:23 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=316895

 Log:
 Fix Bug #55703(PHP crash when calling mysqli_fetch_fields)
 Since the catalog values always is def now, see
 http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html

 Bug: https://bugs.php.net/55703 (Duplicate) PHP crash when calling
 mysqli_fetch_fields

 Ideally, you would wait for a libmysql fix, after the fix add a version
 change and revert. What if libmysql decides to set a value in the future?
 What about people who still use MySQL 4.1.0 ?

 Ulf

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





-- 
Laruence  Xinchen Hui
http://www.laruence.com/

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



Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2011-09-19 Thread Ferenc Kovacs
On Mon, Sep 19, 2011 at 10:19 AM, Ulf Wendel ulf.wen...@oracle.com wrote:
 Am 17.09.2011 05:12, schrieb Xinchen Hui:

 laruence                                 Sat, 17 Sep 2011 03:12:23 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=316895

 Log:
 Fix Bug #55703(PHP crash when calling mysqli_fetch_fields)
 Since the catalog values always is def now, see
 http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html

 Bug: https://bugs.php.net/55703 (Duplicate) PHP crash when calling
 mysqli_fetch_fields

 Ideally, you would wait for a libmysql fix, after the fix add a version
 change and revert. What if libmysql decides to set a value in the future?
 What about people who still use MySQL 4.1.0 ?


uhm, 4.1 is EOLed for some time by now, why should we care about such
an old version?
http://www.mysql.com/support/eol-notice.html

-- 
Ferenc Kovács
@Tyr43l - http://tyrael.hu

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



Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2011-09-19 Thread Ulf Wendel

Am 19.09.2011 11:57, schrieb Ferenc Kovacs:

On Mon, Sep 19, 2011 at 10:19 AM, Ulf Wendelulf.wen...@oracle.com  wrote:

Am 17.09.2011 05:12, schrieb Xinchen Hui:


laruence Sat, 17 Sep 2011 03:12:23 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=316895

Log:
Fix Bug #55703(PHP crash when calling mysqli_fetch_fields)
Since the catalog values always is def now, see
http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html

Bug: https://bugs.php.net/55703 (Duplicate) PHP crash when calling
mysqli_fetch_fields


Ideally, you would wait for a libmysql fix, after the fix add a version
change and revert. What if libmysql decides to set a value in the future?
What about people who still use MySQL 4.1.0 ?



uhm, 4.1 is EOLed for some time by now, why should we care about such
an old version?
http://www.mysql.com/support/eol-notice.html


Good point, are you proposing to change code and make libmysql 5.0+ a 
requirement? If so, several changes should be made to ext/mysql, 
ext/mysqli and PDO_MySQL.


Ulf

nixnutz@linux-fuxh:~/php/php-src/branches/PHP_5_4 grep -H  -n -R 
MYSQL_VERSION_ID ext/mysqli/*.c

[snip]
ext/mysqli/mysqli.c:611:#if MYSQL_VERSION_ID = 4
[snip]
ext/mysqli/mysqli.c:854:#if MYSQL_VERSION_ID = 4
ext/mysqli/mysqli.c:886:#if !defined(MYSQLI_USE_MYSQLND)  defined(ZTS) 
 MYSQL_VERSION_ID = 4
ext/mysqli/mysqli.c:924:#if !defined(MYSQLI_USE_MYSQLND)  defined(ZTS) 
 MYSQL_VERSION_ID = 4


nixnutz@linux-fuxh:~/php/php-src/branches/PHP_5_4 grep -H  -n -R 
MYSQL_VERSION_ID ext/mysql/*.c
ext/mysql/php_mysql.c:82:#if MYSQL_VERSION_ID  32199 || 
defined(MYSQL_USE_MYSQLND)
ext/mysql/php_mysql.c:92:#if MYSQL_VERSION_ID = 32032 || 
defined(MYSQL_USE_MYSQLND)
ext/mysql/php_mysql.c:96:#if MYSQL_VERSION_ID  32133 || 
defined(FIELD_TYPE_TINY)

ext/mysql/php_mysql.c:100:#if MYSQL_VERSION_ID = 32200
ext/mysql/php_mysql.c:111:#if MYSQL_VERSION_ID  32224
ext/mysql/php_mysql.c:129:#if MYSQL_VERSION_ID = 40101
ext/mysql/php_mysql.c:247:#if MYSQL_VERSION_ID  4
ext/mysql/php_mysql.c:308:#if MYSQL_VERSION_ID  4
ext/mysql/php_mysql.c:571:#if MYSQL_VERSION_ID = 4
ext/mysql/php_mysql.c:578:#if MYSQL_VERSION_ID = 4
ext/mysql/php_mysql.c:598:#if MYSQL_VERSION_ID = 4
ext/mysql/php_mysql.c:623:#if !defined(MYSQL_USE_MYSQLND)  
defined(ZTS)  MYSQL_VERSION_ID = 4
ext/mysql/php_mysql.c:655:#if !defined(MYSQL_USE_MYSQLND)  
defined(ZTS)  MYSQL_VERSION_ID = 4

ext/mysql/php_mysql.c:727:#if MYSQL_VERSION_ID = 32230
ext/mysql/php_mysql.c:734:  if ((MYSQL_VERSION_ID / 100) != 
(mysql_get_client_version() / 100)) {
ext/mysql/php_mysql.c:737: 
MYSQL_VERSION_ID, mysql_get_client_version());

ext/mysql/php_mysql.c:836:#if MYSQL_VERSION_ID  32200
ext/mysql/php_mysql.c:1375:#if MYSQL_VERSION_ID  4
ext/mysql/php_mysql.c:1487:#if MYSQL_VERSION_ID  32199

nixnutz@linux-fuxh:~/php/php-src/branches/PHP_5_4 grep -H  -n -R 
MYSQL_VERSION_ID ext/pdo_mysql/*.c
ext/pdo_mysql/mysql_driver.c:330:#if MYSQL_VERSION_ID = 40100 || 
defined(PDO_USE_MYSQLND)
ext/pdo_mysql/mysql_driver.c:342:#if MYSQL_VERSION_ID = 40100 || 
defined(PDO_USE_MYSQLND)
ext/pdo_mysql/mysql_driver.c:356:#if MYSQL_VERSION_ID = 40100 || 
defined(PDO_USE_MYSQLND)

ext/pdo_mysql/mysql_driver.c:481:#if MYSQL_VERSION_ID = 32230
ext/pdo_mysql/mysql_driver.c:489:#if MYSQL_VERSION_ID  32230



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



Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2011-09-19 Thread Ferenc Kovacs

 Good point, are you proposing to change code and make libmysql 5.0+ a
 requirement? If so, several changes should be made to ext/mysql, ext/mysqli
 and PDO_MySQL.


I think that it is your call, but yes, I think it would reasonable,
and it would make our/your work much easier if we would have to
support fewer major versions.

-- 
Ferenc Kovács
@Tyr43l - http://tyrael.hu

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



Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2011-09-19 Thread Johannes Schlüter
On Mon, 2011-09-19 at 12:25 +0200, Ferenc Kovacs wrote:
 
  Good point, are you proposing to change code and make libmysql 5.0+ a
  requirement? If so, several changes should be made to ext/mysql, ext/mysqli
  and PDO_MySQL.
 
 
 I think that it is your call, but yes, I think it would reasonable,
 and it would make our/your work much easier if we would have to
 support fewer major versions.

While we can't change requirements in bug fix versions (5.3.x) and not
sure this is a good thing to do during beta (5.4)

johannes



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



[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2011-09-16 Thread Xinchen Hui
laruence Sat, 17 Sep 2011 03:12:23 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=316895

Log:
Fix Bug #55703(PHP crash when calling mysqli_fetch_fields)
Since the catalog values always is def now, see 
http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html

Bug: https://bugs.php.net/55703 (Duplicate) PHP crash when calling 
mysqli_fetch_fields
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U   php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_api.c
U   php/php-src/trunk/ext/mysqli/mysqli_api.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2011-09-17 
02:52:08 UTC (rev 316894)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2011-09-17 
03:12:23 UTC (rev 316895)
@@ -1053,8 +1053,13 @@
add_property_string(value, orgtable, (char *) (field-org_table ? 
field-org_table : ), 1);
add_property_string(value, def, (field-def ? field-def : ), 1);
add_property_string(value, db, (field-db ? field-db : ), 1);
-   add_property_string(value, catalog, (field-catalog ? field-catalog 
: ), 1);

+   /* FIXME: manually set the catalog to def due to bug in
+* libmysqlclient which does not initialize field-catalog
+* and in addition, the catalog is always be def
+*/
+   add_property_string(value, catalog, def, 1);
+
add_property_long(value, max_length, field-max_length);
add_property_long(value, length, field-length);
add_property_long(value, charsetnr, field-charsetnr);

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_api.c2011-09-17 
02:52:08 UTC (rev 316894)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_api.c2011-09-17 
03:12:23 UTC (rev 316895)
@@ -1057,8 +1057,13 @@
add_property_string(value, orgtable,(field-org_table ? 
field-org_table : ), 1);
add_property_string(value, def,(field-def ? field-def : ), 1);
add_property_string(value, db,(field-db ? field-db : ), 1);
-   add_property_string(value, catalog,(field-catalog ? field-catalog : 
), 1);

+   /* FIXME: manually set the catalog to def due to bug in
+* libmysqlclient which does not initialize field-catalog
+* and in addition, the catalog is always be def
+*/
+   add_property_string(value, catalog, def, 1);
+
add_property_long(value, max_length, field-max_length);
add_property_long(value, length, field-length);
add_property_long(value, charsetnr, field-charsetnr);

Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_api.c   2011-09-17 02:52:08 UTC (rev 
316894)
+++ php/php-src/trunk/ext/mysqli/mysqli_api.c   2011-09-17 03:12:23 UTC (rev 
316895)
@@ -1057,8 +1057,13 @@
add_property_string(value, orgtable,(field-org_table ? 
field-org_table : ), 1);
add_property_string(value, def,(field-def ? field-def : ), 1);
add_property_string(value, db,(field-db ? field-db : ), 1);
-   add_property_string(value, catalog,(field-catalog ? field-catalog : 
), 1);

+   /* FIXME: manually set the catalog to def due to bug in
+* libmysqlclient which does not initialize field-catalog
+* and in addition, the catalog is always be def
+*/
+   add_property_string(value, catalog, def, 1);
+
add_property_long(value, max_length, field-max_length);
add_property_long(value, length, field-length);
add_property_long(value, charsetnr, field-charsetnr);

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2011-08-02 Thread Andrey Hristov
andrey   Tue, 02 Aug 2011 15:30:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=314116

Log:
Remove a warning by explicitly compiling out a non-used variable

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U   php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_api.c
U   php/php-src/trunk/ext/mysqli/mysqli_api.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2011-08-02 
15:09:40 UTC (rev 314115)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2011-08-02 
15:30:58 UTC (rev 314116)
@@ -2233,7 +2233,9 @@
MY_STMT *stmt;
zval*mysql_stmt;
longmode_in;
+#if MYSQL_VERSION_ID = 50107
my_bool mode_b;
+#endif
ulong   mode;
ulong   attr;
void*mode_p;

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_api.c2011-08-02 
15:09:40 UTC (rev 314115)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_api.c2011-08-02 
15:30:58 UTC (rev 314116)
@@ -2237,7 +2237,9 @@
MY_STMT *stmt;
zval*mysql_stmt;
longmode_in;
+#if MYSQL_VERSION_ID = 50107
my_bool mode_b;
+#endif
ulong   mode;
ulong   attr;
void*mode_p;

Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_api.c   2011-08-02 15:09:40 UTC (rev 
314115)
+++ php/php-src/trunk/ext/mysqli/mysqli_api.c   2011-08-02 15:30:58 UTC (rev 
314116)
@@ -2237,7 +2237,9 @@
MY_STMT *stmt;
zval*mysql_stmt;
longmode_in;
+#if MYSQL_VERSION_ID = 50107
my_bool mode_b;
+#endif
ulong   mode;
ulong   attr;
void*mode_p;

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