Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into test | Dmitry Stogov | 2014-08-11 | 1 | -0/+120 |
|\ | |||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-08-06 | 1 | -0/+120 |
| |\ | |||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2014-08-06 | 1 | -12/+34 |
| | |\ | |||||
| | | * | Add EXPECTF | Andrey Hristov | 2014-08-06 | 1 | -12/+34 |
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2014-08-06 | 1 | -0/+98 |
| | |\ \ | | | |/ | |||||
| | | * | Fix handling of multi-result sets with PS...used to clean not only | Andrey Hristov | 2014-08-06 | 1 | -0/+98 |
| | * | | Merge commit '8b9719d' into PHP-5.5 | Rasmus Lerdorf | 2014-07-30 | 1 | -0/+3 |
| | |\ \ | | | |/ | |||||
| * | | | Merge commit '8b9719d' into PHP-5.6 | Rasmus Lerdorf | 2014-07-30 | 1 | -0/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
* | | | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-08-04 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge commit '8b9719d' | Rasmus Lerdorf | 2014-07-30 | 1 | -0/+3 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | We need to turn off any strict mode here for this warning to show up | Rasmus Lerdorf | 2014-07-30 | 1 | -0/+3 |
* | | | | Merge remote-tracking branch 'origin/master' into phpng | Xinchen Hui | 2014-07-18 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add some trace info as well as update CLIENT_ flags | Andrey Hristov | 2014-07-16 | 1 | -0/+1 |
* | | | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-06-20 | 3 | -9/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2014-06-20 | 3 | -9/+9 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2014-06-20 | 3 | -9/+9 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed MarinaDB support | Dmitry Stogov | 2014-06-20 | 3 | -9/+9 |
* | | | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-06-20 | 2 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix another problem with MySQL 5.7 | Andrey Hristov | 2014-06-18 | 1 | -1/+1 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-06-18 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Suppress test failure with MySQL 5.7 | Andrey Hristov | 2014-06-18 | 1 | -1/+1 |
* | | | | Refcount may have different meaning in PHP NG | Xinchen Hui | 2014-06-19 | 1 | -26/+26 |
* | | | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-06-12 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug 64744 | Boro Sitnikovski | 2014-06-08 | 1 | -1/+1 |
* | | | | Finish refactoring of MySQLi | Xinchen Hui | 2014-05-11 | 1 | -15/+15 |
|/ / / | |||||
* | | | fix test - doesn't seem to produce warning | Stanislav Malyshev | 2014-04-14 | 1 | -2/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-04-14 | 1 | -6/+86 |
|\ \ \ | |/ / | |||||
| * | | Add test | Andrey Hristov | 2014-04-14 | 1 | -0/+119 |
* | | | Fix the fix | Andrey Hristov | 2014-04-10 | 1 | -9/+0 |
* | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 | Andrey Hristov | 2014-04-10 | 2 | -44/+73 |
|\ \ \ | |||||
| * \ \ | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-03-26 | 1 | -35/+20 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix test | Andrey Hristov | 2014-03-26 | 1 | -35/+20 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-03-20 | 2 | -9/+15 |
| |\ \ \ | | |/ / | |||||
| | * | | Emit a warning in case of unallowed characters. Fix another place this | Andrey Hristov | 2014-03-20 | 2 | -9/+15 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-03-19 | 1 | -13/+42 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix problem with mysqli_commt()/mysqli_rollback() | Andrey Hristov | 2014-03-19 | 1 | -13/+42 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-03-18 | 1 | -0/+140 |
| |\ \ \ | | |/ / | |||||
| | * | | Add a test | Andrey Hristov | 2014-03-18 | 1 | -0/+140 |
* | | | | New result fetching mode for mysqlnd, which should use less memory but | Andrey Hristov | 2014-04-10 | 23 | -85/+1020 |
|/ / / | |||||
* | | | Refactor the result set data structures. Move more to the buffered and unbuff... | Andrey Hristov | 2014-03-05 | 1 | -2/+2 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-02-27 | 1 | -0/+26 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-02-27 | 1 | -0/+26 |
| |\ \ | | |/ | |||||
| | * | test for bug #66762 | Remi Collet | 2014-02-27 | 1 | -0/+26 |
* | | | Add new INI for rollbacking connections put back into the pconn pool | Andrey Hristov | 2014-01-29 | 1 | -11/+87 |
* | | | fix test - new flag ZEND_ACC_HAS_TYPE_HINTS | Stanislav Malyshev | 2014-01-26 | 1 | -2/+2 |
* | | | Fix test | Xinchen Hui | 2013-12-25 | 1 | -1/+1 |
* | | | Fixed test failed after rev 57c1335f | Xinchen Hui | 2013-12-17 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-11-21 | 1 | -0/+101 |
|\ \ | |/ | |||||
| * | Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with... | Andrey Hristov | 2013-11-21 | 1 | -0/+101 |
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-11-08 | 1 | -0/+24 |
|\ \ | |/ |