[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli.c

2013-07-16 Thread Anatol Belski 
Commit:fd5cdf89a8ddde4c5a9cf4cfb95415de07caf7b9
Author:Anatol Belski  Tue, 16 Jul 2013 18:05:45 +0200
Parents:   f37ac6f5912d605633e0abf6310255b9d851d078 
bb6d74918ea66099cf36c5509e844df0f15a7515
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=fd5cdf89a8ddde4c5a9cf4cfb95415de07caf7b9

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix TS build

Changed paths:
  MM  ext/mysqli/mysqli.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli.c ext/pdo_mysql/pdo_mysql.c

2013-07-16 Thread Johannes Schlüter 
Commit:e1a0c90b8b032ce8a677b5aeca9920ceac41fc72
Author:Johannes Schlüter  Tue, 16 Jul 2013 
13:55:32 +0200
Parents:   54b740a7e1ceea80690d47833a3fe667ce839522 
d3a4af4db8d44f3d4a353589857c3c016ba8beda
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e1a0c90b8b032ce8a677b5aeca9920ceac41fc72

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/mysqli/mysqli.c
  MM  ext/pdo_mysql/pdo_mysql.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_result.c

2013-04-27 Thread Xinchen Hui 
Commit:1c07590ed7bf8b5fca9f232eae321e26f05acbd9
Author:Xinchen Hui  Sat, 27 Apr 2013 23:41:51 
+0800
Parents:   ca148c030fd71203ea026263ce99be3ec49f0865 
8f5a534b215905790a4dd5465804c1fbc21468c4
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1c07590ed7bf8b5fca9f232eae321e26f05acbd9

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/mysqli/mysqli.c
  MM  ext/mysqlnd/mysqlnd_result.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli.c ext/mysqli/mysqli_api.c

2013-01-09 Thread Andrey Hristov 
Commit:846e506a3d1d11773171e08d3c6f9bbc7fc3dacd
Author:Andrey Hristov  Wed, 9 Jan 2013 19:15:29 
+0100
Parents:   790096b68b2a58eb691e8a6f33325e8826bec263 
d430b5a4eb26679a6dfa7055dff43cae8dabd20e
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=846e506a3d1d11773171e08d3c6f9bbc7fc3dacd

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/mysqli/mysqli.c
  MM  ext/mysqli/mysqli_api.c


Diff:



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