summaryrefslogtreecommitdiff
path: root/ext/mysqli
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5ULF WENDEL2013-01-102-0/+149
|\ | | | | | | | | * PHP-5.4: MySQL 5.6 EXPIRE PASSWORD flag tests
| * MySQL 5.6 EXPIRE PASSWORD flag testsULF WENDEL2013-01-102-0/+149
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-01-092-0/+6
|\ \ | |/
| * 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
| |
* | fix different values of mysqli_stmt_affected_rows between libmysqlAndrey Hristov2013-01-071-2/+2
| | | | | | | | and mysqlnd (in favor of libmysql) before execute and after prepare()
* | Happy New YearXinchen Hui2013-01-0116-16/+16
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2012-12-171-33/+34
|\ \ | |/
| * 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.4' into PHP-5.5Rasmus Lerdorf2012-12-131-0/+1
|\ \ \ | |/ /
| * | 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.4' into PHP-5.5Rasmus Lerdorf2012-12-131-1/+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.4' into PHP-5.5Xinchen Hui2012-11-302-2/+42
|\ \ \ | |/ /
| * | 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
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-251-0/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed Bug #63361 Header not installed
| * | 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.
* | | add protection against core dumps if the underlying library returnsAndrey Hristov2012-10-183-15/+42
| | | | | | | | | | | | 0x0 for some reason
* | | Merge branch 'PHP-5.4'ULF WENDEL2012-09-292-4/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Cover have_ssl=NO and have_ssl=DISABLED
| * | 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
| | |
* | | Updating expected output in anticipation of mysqlnd_auth.c pathULF WENDEL2012-09-291-0/+2
| | |
* | | Merge branch 'PHP-5.4'ULF WENDEL2012-09-293-3/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.4: - BFN Minor changes for MySQL 5.6 NEWS for 76601c4
| * | 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 'master' of git.php.net:php-srcULF WENDEL2012-09-291-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git.php.net:php-src: - Fixed bug #63214 (Large PDO Firebird Queries) Fix bug #63240 on stream_get_line() extended the SKIPIF section with ICU 49 (sync with 5.4 branch) fixed tests for gd having freetype >= 2.4.10 sapi/litespeed/lsapi_main.c: Fix bug #63228 fix test constify Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
| * | | fix testAndrey Hristov2012-10-121-0/+6
| | | |
* | | | SHA256 authentication testsULF WENDEL2012-09-294-0/+560
|/ / /
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-101-0/+0
|\ \ \ | |/ /
| * | 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.4'Xinchen Hui2012-10-103-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
| | |
* | | add a check for libmysqlAndrey Hristov2012-10-032-0/+4
| | |
* | | change public key setting to PERDIR and finish code that allowsandrey2012-09-252-4/+7
| | | | | | | | | | | | to set the key file programatically per mysqli_options()
* | | Add SHA256 authentication support - password hashing to mysqlndandrey2012-09-251-1/+1
| | | | | | | | | | | | Automatic switchover to SSL with plain-text password is not part of this
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-08-222-0/+31
|\ \ \ | |/ /
| * | 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
| | |
* | | Annother attempt at fixing the mysqli_fetch_field testsNikita Popov2012-08-176-135/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of character set detection (which doesn't always work correctly) fetch the character set info using mysqli_get_charset(). To make sure that the returned info applies to all of client, connection and result explicitely set utf8 as charset using mysqli_set_charset() before. I'm not sure whether that last part is really necessary, but included it to be safe.
* | | Revert "Try to fix mysqli_field tests"Nikita Popov2012-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | This reverts commit 018395efafeb8cbce0b8864ca4a1eac232db1cbb. This change didn't really make sense in hindsight. Looking for some other fix.
* | | Try to fix mysqli_field testsNikita Popov2012-08-151-2/+2
| | | | | | | | | | | | | | | Those tests seem to fail when people have a different default collation, so try to fix by specifying utf8_general_ci explicitely.
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-302-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed the common misspelling of the word occurred (occured -> occurred)
| * | Fixed the common misspelling of the word occurred (occured -> occurred)Marc Easen2012-06-302-2/+2
| | |
View Lorry Controller Status