Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2015-01-05 | 1 | -10/+2 |
|\ | | | | | | | | | * PHP-5.5: Update test after fixing bug #68371 | ||||
| * | Update test after fixing bug #68371 | Matteo Beccati | 2015-01-05 | 1 | -10/+2 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2015-01-05 | 2 | -0/+102 |
|\ \ | |/ | | | | | | | * PHP-5.5: Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names | ||||
| * | Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵ | Matteo Beccati | 2015-01-05 | 2 | -0/+102 |
| |\ | | | | | | | | | | attribute names | ||||
| | * | Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵ | Matteo Beccati | 2014-11-10 | 2 | -0/+102 |
| | | | | | | | | | | | | attribute names | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-06 | 1 | -4/+5 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: C89 compat add include for missing localeconv_r proto | ||||
| * | | C89 compat | Anatol Belski | 2014-12-06 | 1 | -4/+5 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2014-12-06 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Fix compilation error (ref #68424) | ||||
| * | | Fix compilation error (ref #68424) | Matteo Beccati | 2014-12-06 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2014-12-05 | 6 | -4/+366 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: Updated NEWS Start adding new attribute to control multi statements | ||||
| * | | Start adding new attribute to control multi statements | pwolanin | 2014-12-05 | 6 | -4/+366 |
| |/ | |||||
* | | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c | ||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2014-06-20 | 5 | -7/+7 |
|\ \ | |/ | | | | | | | * PHP-5.5: Fixed MarinaDB support | ||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2014-06-20 | 5 | -7/+7 |
| |\ | | | | | | | | | | | | | * PHP-5.4: Fixed MarinaDB support | ||||
| | * | Fixed MarinaDB support | Dmitry Stogov | 2014-06-20 | 5 | -7/+7 |
| | | | |||||
* | | | Bug 64744 | Boro Sitnikovski | 2014-06-08 | 4 | -4/+4 |
| | | | | | | | | | | | | Show the type of the non-object for more descriptive errors | ||||
* | | | New result fetching mode for mysqlnd, which should use less memory but | Andrey Hristov | 2014-04-10 | 1 | -2/+2 |
|/ / | | | | | | | | | | | | | | | implies more memory copy. The old method is still available and can be used. It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query() New mode can be forced with an INI setting, for all extensions that support this mode (ext/mysql and mysqli, because PDO due to it's architecture can't support it) The setting is mysqlnd.fetch_data_copy=[0|1] | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Johannes Schlüter | 2014-02-23 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | We can't dereference dbh if it is NULL | Johannes Schlüter | 2014-02-23 | 1 | -1/+6 |
| | | |||||
| * | Bump year | Xinchen Hui | 2014-01-03 | 5 | -5/+5 |
| | | |||||
* | | Bump year | Xinchen Hui | 2014-01-03 | 5 | -5/+5 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-11-26 | 1 | -0/+38 |
|\ \ | |/ | |||||
| * | add test | Andrey Hristov | 2013-11-26 | 1 | -0/+38 |
| | | |||||
* | | fix mysql tests & mark nextRowset problematic tests | Stanislav Malyshev | 2013-08-24 | 6 | -9/+18 |
| | | |||||
* | | Fix long-standing visual pain point: the misalignment of './configure help' ↵ | Christopher Jones | 2013-08-06 | 1 | -3/+3 |
| | | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes. | ||||
* | | This doesn't fail in 5.5 anymore | Rasmus Lerdorf | 2013-08-03 | 1 | -2/+0 |
| | | |||||
* | | Merge commit 'd60e168' into PHP-5.5 | Rasmus Lerdorf | 2013-08-02 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * commit 'd60e168': pcre_quote? No such thing. How did this ever pass? | ||||
| * | pcre_quote? No such thing. How did this ever pass? | Rasmus Lerdorf | 2013-08-02 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'ea75b1b' into PHP-5.5 | Rasmus Lerdorf | 2013-08-02 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | * commit 'ea75b1b': This test needs local infile enabled | ||||
| * | This test needs local infile enabled | Rasmus Lerdorf | 2013-08-02 | 1 | -0/+1 |
| | | |||||
* | | Fix bug 65299 | Johannes Schlüter | 2013-07-23 | 3 | -3/+3 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Johannes Schlüter | 2013-07-23 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Fix compiler warning on redefined constant | Johannes Schlüter | 2013-07-23 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Johannes Schlüter | 2013-07-16 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Make zval2myslqnd implementations aware of inheritance | Johannes Schlüter | 2013-07-16 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-07-02 | 2 | -6/+5 |
|\ \ | |/ | | | | | | | | | | | | | * PHP-5.4: Fixed mysql tests parsing phpinfo() Update NEWS Fixed bug #35703: when session_name("123") consist only digits, should warning Fixed bug #49175: mod_files.sh does not support hash bits | ||||
| * | Fixed mysql tests parsing phpinfo() | Anatol Belski | 2013-07-02 | 2 | -6/+5 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-06-17 | 2 | -7/+10 |
|\ \ | |/ | | | | | | | | | * PHP-5.4: Tests: PDO Mysql - update for fixed getColumnMeta() fix bug #48724 | ||||
| * | Tests: PDO Mysql - update for fixed getColumnMeta() | Daniel Beardsley | 2013-06-17 | 1 | -5/+5 |
| | | | | | | | | The test has always been disabled... so it's never run anyway. Oh well. | ||||
| * | fix bug #48724 | Antony Dovgal | 2013-06-17 | 1 | -2/+5 |
| | | | | | | | | PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-06-17 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix typo in test | Xinchen Hui | 2013-06-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-06-16 | 1 | -0/+54 |
|\ \ | |/ | |||||
| * | Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to ↵ | Xinchen Hui | 2013-06-16 | 1 | -0/+54 |
| | | | | | | | | the same db server) | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-03-13 | 1 | -13/+7 |
|\ \ | |/ | | | | | | | Conflicts: NEWS | ||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Andrey Hristov | 2013-03-13 | 1 | -13/+7 |
| |\ | | | | | | | | | | | | | Conflicts: NEWS | ||||
| | * | Happy New Year~ | Xinchen Hui | 2013-01-01 | 5 | -5/+5 |
| | | | |||||
| * | | Happy New Year | Xinchen Hui | 2013-01-01 | 5 | -5/+5 |
| | | | |||||
* | | | Happy New Year | Xinchen Hui | 2013-01-01 | 5 | -5/+5 |
| | | | |||||
* | | | Really fix test pdo_mysql_class_constants.phpt | Remi Collet | 2012-12-12 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - with mysqlnd, constant always present - with mysqli, check client library version - without mysqlnd and without mysqli skip the test if no connection use connection to check client library Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..." so, getClientVersion() return "11" |