summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2015-01-051-10/+2
|\ | | | | | | | | * PHP-5.5: Update test after fixing bug #68371
| * Update test after fixing bug #68371Matteo Beccati2015-01-051-10/+2
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2015-01-052-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 Beccati2015-01-052-0/+102
| |\ | | | | | | | | | attribute names
| | * Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵Matteo Beccati2014-11-102-0/+102
| | | | | | | | | | | | attribute names
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-061-4/+5
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: C89 compat add include for missing localeconv_r proto
| * | C89 compatAnatol Belski2014-12-061-4/+5
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2014-12-061-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix compilation error (ref #68424)
| * | Fix compilation error (ref #68424)Matteo Beccati2014-12-061-2/+2
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-056-4/+366
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: Updated NEWS Start adding new attribute to control multi statements
| * | Start adding new attribute to control multi statementspwolanin2014-12-056-4/+366
| |/
* | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-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.6Dmitry Stogov2014-06-205-7/+7
|\ \ | |/ | | | | | | * PHP-5.5: Fixed MarinaDB support
| * Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2014-06-205-7/+7
| |\ | | | | | | | | | | | | * PHP-5.4: Fixed MarinaDB support
| | * Fixed MarinaDB supportDmitry Stogov2014-06-205-7/+7
| | |
* | | Bug 64744Boro Sitnikovski2014-06-084-4/+4
| | | | | | | | | | | | Show the type of the non-object for more descriptive errors
* | | New result fetching mode for mysqlnd, which should use less memory butAndrey Hristov2014-04-101-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.5Johannes Schlüter2014-02-231-1/+6
|\ \ | |/
| * We can't dereference dbh if it is NULLJohannes Schlüter2014-02-231-1/+6
| |
| * Bump yearXinchen Hui2014-01-035-5/+5
| |
* | Bump yearXinchen Hui2014-01-035-5/+5
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-11-261-0/+38
|\ \ | |/
| * add testAndrey Hristov2013-11-261-0/+38
| |
* | fix mysql tests & mark nextRowset problematic testsStanislav Malyshev2013-08-246-9/+18
| |
* | Fix long-standing visual pain point: the misalignment of './configure help' ↵Christopher Jones2013-08-061-3/+3
| | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes.
* | This doesn't fail in 5.5 anymoreRasmus Lerdorf2013-08-031-2/+0
| |
* | Merge commit 'd60e168' into PHP-5.5Rasmus Lerdorf2013-08-021-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 Lerdorf2013-08-021-1/+1
| |
* | Merge commit 'ea75b1b' into PHP-5.5Rasmus Lerdorf2013-08-021-0/+1
|\ \ | |/ | | | | | | * commit 'ea75b1b': This test needs local infile enabled
| * This test needs local infile enabledRasmus Lerdorf2013-08-021-0/+1
| |
* | Fix bug 65299Johannes Schlüter2013-07-233-3/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-07-231-3/+3
|\ \ | |/
| * Fix compiler warning on redefined constantJohannes Schlüter2013-07-231-3/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-07-161-1/+1
|\ \ | |/
| * Make zval2myslqnd implementations aware of inheritanceJohannes Schlüter2013-07-161-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-022-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 Belski2013-07-022-6/+5
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-172-7/+10
|\ \ | |/ | | | | | | | | * PHP-5.4: Tests: PDO Mysql - update for fixed getColumnMeta() fix bug #48724
| * Tests: PDO Mysql - update for fixed getColumnMeta()Daniel Beardsley2013-06-171-5/+5
| | | | | | | | The test has always been disabled... so it's never run anyway. Oh well.
| * fix bug #48724Antony Dovgal2013-06-171-2/+5
| | | | | | | | PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-171-1/+1
|\ \ | |/
| * Fix typo in testXinchen Hui2013-06-171-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-161-0/+54
|\ \ | |/
| * Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to ↵Xinchen Hui2013-06-161-0/+54
| | | | | | | | the same db server)
* | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-03-131-13/+7
|\ \ | |/ | | | | | | Conflicts: NEWS
| * Merge branch 'PHP-5.3' into PHP-5.4Andrey Hristov2013-03-131-13/+7
| |\ | | | | | | | | | | | | Conflicts: NEWS
| | * Happy New Year~Xinchen Hui2013-01-015-5/+5
| | |
| * | Happy New YearXinchen Hui2013-01-015-5/+5
| | |
* | | Happy New YearXinchen Hui2013-01-015-5/+5
| | |
* | | Really fix test pdo_mysql_class_constants.phptRemi Collet2012-12-121-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"