summaryrefslogtreecommitdiff
path: root/ext/mysqli
Commit message (Collapse)AuthorAgeFilesLines
* fix TS buildAnatol Belski2013-07-161-1/+1
|
* Make zval2myslqnd implementations aware of inheritanceJohannes Schlüter2013-07-161-1/+1
|
* typo fixesVeres Lajos2013-07-153-4/+4
|
* Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4Andrey Hristov2013-07-081-2/+2
|\ | | | | | | | | Conflicts: NEWS
| * Make sure result is initilizedJohannes Schlüter2013-07-031-2/+2
| | | | | | | | | | Practically this could only be an issue when overriding mysqlnd from an extension, but makes static analysis happy
* | Fixed segfault in mysqlnd when doing long prepareAndrey Hristov2013-07-081-0/+50
|/
* Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | * pull-request/341: (23 commits) typofixes
* Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-04-271-2/+2
|\
| * Also fixed bug #64726 in 5.3Xinchen Hui2013-04-272-3/+3
| |
* | Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB ↵Xinchen Hui2013-04-272-2/+2
| | | | | | | | pointer has closed)
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-04-271-0/+23
|\ \ | |/
| * Fix memory realted to #64726Xinchen Hui2013-04-271-0/+23
| |
| * Happy New Year~Xinchen Hui2013-01-0115-15/+15
| |
* | MySQL 5.6 EXPIRE PASSWORD flag testsULF WENDEL2013-01-102-0/+149
| |
* | Add mysqli support - constants and checking in mysqli_options() for theAndrey Hristov2013-01-092-0/+6
| | | | | | | | new constant for password expriration
* | Happy New YearXinchen Hui2013-01-0117-17/+17
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-12-171-33/+34
|\ \ | |/
| * dos2unix & skip on connect failXinchen Hui2012-12-171-33/+34
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Rasmus Lerdorf2012-12-131-0/+1
|\ \ | |/
| * Need connect.inc hereRasmus Lerdorf2012-12-131-0/+1
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Rasmus Lerdorf2012-12-131-1/+1
|\ \ | |/
| * Fix broken testRasmus Lerdorf2012-12-131-1/+1
| | | | | | | | | | Need to use the configured connection parameters here. We can't assume the test user has access.
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-11-302-2/+42
|\ \ | |/
| * Fixed bug #63398 (Segfault when polling closed link)Xinchen Hui2012-11-302-2/+42
| |
* | Fixed Bug #63361 Header not installedRemi Collet2012-11-251-0/+3
| | | | | | | | | | | | ext/mysqli/php_mysqli_structs.h is installed and includes mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also be installed.
* | Merge branch 'PHP-5.3' into PHP-5.4ULF WENDEL2012-09-292-4/+4
|\ \ | |/ | | | | | | * PHP-5.3: Cover have_ssl=NO and have_ssl=DISABLED
| * Cover have_ssl=NO and have_ssl=DISABLEDULF WENDEL2012-09-292-4/+4
| |
* | Merge branch 'PHP-5.3' into PHP-5.4ULF WENDEL2012-09-293-3/+9
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.3: Minor changes for MySQL 5.6 NEWS for 76601c4 Conflicts: NEWS
| * Minor changes for MySQL 5.6ULF WENDEL2012-09-293-3/+9
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-101-0/+0
|\ \ | |/
| * Remove executable permission on incXinchen Hui2012-10-101-0/+0
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-104-0/+0
|\ \ | |/
| * Remove executable permission on phptXinchen Hui2012-10-104-0/+0
| |
| * Correct PHP versionXinchen Hui2012-09-051-1/+1
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-08-222-0/+31
|\ \ | |/
| * Fixed bug #62885 (mysqli_poll - Segmentation fault)Xinchen Hui2012-08-222-0/+31
| |
* | Fixed the common misspelling of the word occurred (occured -> occurred)Marc Easen2012-06-302-2/+2
| |
* | Merge branch 'PHP-5.3' into PHP-5.4andrey2012-05-161-0/+40
|\ \ | |/ | | | | | | | | | | Conflicts: ext/mysqlnd/mysqlnd_ps.c merge fix for bug#62046
| * Fix for bug#62046andrey2012-05-161-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to mysqli_stmt_reset(). Stmt's state was changed to STMT_PREPARED and leads the driver to think that the stmt was just prepared. Because result set exist also for only prepared but not executed sets, the check for stmt->result isn't any good. There is a result set, because as response for COM_PREPARE the server sends metadata and metadata is part of a result set. After COM_EXECUTE the server sends metadata again, which could be different and in this case more correct.
| * Test for MySQL version.Variable is deprecated in MySQL 5.6.Ulf Wendel2012-03-141-22/+24
| |
| * Use correct property ctor, should fix threading issue in bug #55334Johannes Schlüter2012-03-081-1/+1
| | | | | | | | | | # The code was refactored in 5_4/trunk, no need to merge
| * Fix bug #61003 mysql_stat() require a valid connectionJohannes Schlüter2012-03-061-0/+4
| |
| * - Year++Felipe Pena2012-01-0115-15/+15
| |
| * fix for 5.5.19Andrey Hristov2011-12-141-1/+1
| |
| * another fixAndrey Hristov2011-12-141-1/+1
| |
| * fix testAndrey Hristov2011-12-141-1/+1
| |
| * fix testAndrey Hristov2011-12-141-1/+1
| |
| * fix typoAndrey Hristov2011-12-141-1/+1
| |
| * fix testAndrey Hristov2011-12-141-2/+2
| |
| * Good to fix something, but don't forget to update testsUlf Wendel2011-11-231-0/+4
| |
View Lorry Controller Status