Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 ↵ | Andrey Hristov | 2013-11-21 | 1 | -0/+101 |
| | | | | | | | | with 'i') | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-11-08 | 1 | -0/+24 |
|\ \ | |/ | |||||
| * | Fixed Bug #66043 (Segfault calling bind_param() on mysqli) | Xinchen Hui | 2013-11-08 | 1 | -0/+24 |
| | | | | | | | | | | Although the doc said it is (unsigned int *), but it is ulong* in the libmysql 5.0 's source codes | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-04 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c | ||||
| * | non living code related typo fixes | Veres Lajos | 2013-08-04 | 1 | -1/+1 |
| | | |||||
| * | typo fixes | Veres Lajos | 2013-07-15 | 3 | -4/+4 |
| | | |||||
* | | typo fixes | Veres Lajos | 2013-07-15 | 3 | -4/+4 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-07-08 | 1 | -0/+50 |
|\ \ | |/ | | | | | | | Conflicts: NEWS | ||||
| * | Fixed segfault in mysqlnd when doing long prepare | Andrey Hristov | 2013-07-08 | 1 | -0/+50 |
| | | |||||
| * | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -1/+1 |
| | | | | | | | | | | * pull-request/341: (23 commits) typofixes | ||||
* | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -1/+1 |
| | | | | | | | | | | * pull-request/341: (23 commits) typofixes | ||||
* | | Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when ↵ | Andrey Hristov | 2013-05-14 | 1 | -4/+4 |
| | | | | | | | | using Connector/C | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-04-27 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-04-27 | 1 | -2/+2 |
| |\ | |||||
| | * | Also fixed bug #64726 in 5.3 | Xinchen Hui | 2013-04-27 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-04-27 | 1 | -0/+23 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB ↵ | Xinchen Hui | 2013-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | pointer has closed) | ||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-04-27 | 1 | -0/+23 |
| |\ \ | | |/ | |||||
| | * | Fix memory realted to #64726 | Xinchen Hui | 2013-04-27 | 1 | -0/+23 |
| | | | |||||
* | | | update test case | Andrey Hristov | 2013-02-08 | 1 | -0/+46 |
| | | | |||||
* | | | mysqli_savepoint()/mysqli_release_savepoint() | Andrey Hristov | 2013-02-08 | 1 | -0/+2 |
| | | | |||||
* | | | Add the constants needed for mysqli_commit(), _rollback() and | Andrey Hristov | 2013-02-08 | 1 | -3/+10 |
| | | | | | | | | | | | | begin_transaction() | ||||
* | | | Add support for begin_transaction in libmysql mode. | Andrey Hristov | 2013-02-07 | 3 | -28/+81 |
| | | | | | | | | | | | | Add support for flags and name for commit/rollback in libmysql mode | ||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | ULF WENDEL | 2013-01-10 | 2 | -0/+149 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: MySQL 5.6 EXPIRE PASSWORD flag tests | ||||
| * | | MySQL 5.6 EXPIRE PASSWORD flag tests | ULF WENDEL | 2013-01-10 | 2 | -0/+149 |
| | | | |||||
* | | | fix different values of mysqli_stmt_affected_rows between libmysql | Andrey Hristov | 2013-01-07 | 1 | -2/+2 |
| | | | | | | | | | | | | and mysqlnd (in favor of libmysql) before execute and after prepare() | ||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2012-12-17 | 1 | -33/+34 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-12-17 | 1 | -33/+34 |
| |\ \ | | |/ | |||||
| | * | dos2unix & skip on connect fail | Xinchen Hui | 2012-12-17 | 1 | -33/+34 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Rasmus Lerdorf | 2012-12-13 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Rasmus Lerdorf | 2012-12-13 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | Need connect.inc here | Rasmus Lerdorf | 2012-12-13 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Rasmus Lerdorf | 2012-12-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Rasmus Lerdorf | 2012-12-13 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fix broken test | Rasmus Lerdorf | 2012-12-13 | 1 | -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.5 | Xinchen Hui | 2012-11-30 | 1 | -0/+34 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-11-30 | 1 | -0/+34 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #63398 (Segfault when polling closed link) | Xinchen Hui | 2012-11-30 | 1 | -0/+34 |
| | | | |||||
* | | | add protection against core dumps if the underlying library returns | Andrey Hristov | 2012-10-18 | 2 | -5/+5 |
| | | | | | | | | | | | | 0x0 for some reason | ||||
* | | | Merge branch 'PHP-5.4' | ULF WENDEL | 2012-09-29 | 2 | -4/+4 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Cover have_ssl=NO and have_ssl=DISABLED | ||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | ULF WENDEL | 2012-09-29 | 2 | -4/+4 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.3: Cover have_ssl=NO and have_ssl=DISABLED | ||||
| | * | Cover have_ssl=NO and have_ssl=DISABLED | ULF WENDEL | 2012-09-29 | 2 | -4/+4 |
| | | | |||||
* | | | Updating expected output in anticipation of mysqlnd_auth.c path | ULF WENDEL | 2012-09-29 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | ULF WENDEL | 2012-09-29 | 3 | -3/+9 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | * PHP-5.4: - BFN Minor changes for MySQL 5.6 NEWS for 76601c4 | ||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | ULF WENDEL | 2012-09-29 | 3 | -3/+9 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Minor changes for MySQL 5.6 NEWS for 76601c4 Conflicts: NEWS | ||||
| | * | Minor changes for MySQL 5.6 | ULF WENDEL | 2012-09-29 | 3 | -3/+9 |
| | | | |||||
* | | | Merge branch 'master' of git.php.net:php-src | ULF WENDEL | 2012-09-29 | 1 | -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 test | Andrey Hristov | 2012-10-12 | 1 | -0/+6 |
| | | | | |||||
* | | | | SHA256 authentication tests | ULF WENDEL | 2012-09-29 | 4 | -0/+560 |
|/ / / |