Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 2 | -3/+3 |
| | | | | | * pull-request/341: (23 commits) typofixes | ||||
* | updates | Andrey Hristov | 2013-05-21 | 1 | -1/+1 |
| | |||||
* | don't include smart_str.h in a too global header, fixes #64718 | Johannes Schlüter | 2013-04-30 | 2 | -1/+2 |
| | |||||
* | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-04-27 | 1 | -0/+1 |
|\ | |||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-04-27 | 1 | -0/+1 |
| |\ | |||||
| | * | Fix memory realted to #64726 | Xinchen Hui | 2013-04-27 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-04-19 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Andrey Hristov | 2013-04-19 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | lower the limit, should fit in a byte | Andrey Hristov | 2013-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | Fix some errors in mysqlnd charset list | Nikita Popov | 2013-03-24 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I fixed the stuff that seemed obviously wrong, but there are some more differences with the SHOW COLLATIONS output: * The whole range of "utf16" collations missing * "filename" missing * "ucs2_general_mysql500_ci" and "utf8_general_mysql500_ci" missing I wasn't sure whether those omissions are intentional, so I didn't add them. | ||||
* | | | fix the fix | Andrey Hristov | 2013-03-13 | 1 | -2/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-03-13 | 1 | -0/+1 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: NEWS | ||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Andrey Hristov | 2013-03-13 | 1 | -1/+1 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: NEWS | ||||
| | * | fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for ↵ | Andrey Hristov | 2013-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | stmt->param_bind | ||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Johannes Schlüter | 2013-02-21 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs) | Johannes Schlüter | 2013-02-21 | 2 | -2/+2 |
| | | | |||||
* | | | build fixes | Andrey Hristov | 2013-02-11 | 1 | -3/+3 |
| | | | |||||
* | | | Add savepoint and rollback to savepoint support | Andrey Hristov | 2013-02-08 | 3 | -0/+72 |
| | | | |||||
* | | | Export new calls | Andrey Hristov | 2013-02-07 | 3 | -7/+5 |
| | | | |||||
* | | | Add the name in a comment at commit/rollback, if provided | Andrey Hristov | 2013-02-07 | 1 | -1/+7 |
| | | | |||||
* | | | Add support for commit and rollback options. | Andrey Hristov | 2013-02-07 | 3 | -8/+142 |
| | | | | | | | | | | | | | | | Add support for explicitly starting a transaction - modes also available. Using the API makes the life of load balancer mysqlnd plugins easier/possible. | ||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-02-04 | 1 | -1/+8 |
|\ \ \ | |/ / | |||||
| * | | check the validity of the parameter | Andrey Hristov | 2013-02-04 | 1 | -1/+8 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-02-01 | 1 | -8/+11 |
|\ \ \ | |/ / | |||||
| * | | add new charset, from MySQL 5.6 | Andrey Hristov | 2013-02-01 | 1 | -8/+11 |
| | | | |||||
| * | | backport handling of expired passwords in mysqlnd to 5.4 | Andrey Hristov | 2013-01-09 | 2 | -2/+14 |
| | | | |||||
* | | | fix valgrind warning | Andrey Hristov | 2013-01-22 | 1 | -1/+1 |
| | | | |||||
* | | | Use two dtors thus allow allocation based on the alloc model of the | Andrey Hristov | 2013-01-15 | 1 | -5/+19 |
| | | | | | | | | | | | | connection. | ||||
* | | | plug a leak - forgot ot use the dtor already written | Andrey Hristov | 2013-01-15 | 1 | -1/+2 |
| | | | |||||
* | | | Add support for connect attributes, as of MySQL 5.6 | Andrey Hristov | 2013-01-15 | 8 | -8/+171 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-01-09 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: ext/mysqlnd/mysqlnd.c | ||||
| * | | fix compilation error after merge | Andrey Hristov | 2013-01-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2013-01-09 | 1 | -0/+2 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: ext/mysqlnd/mysqlnd.c | ||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Andrey Hristov | 2013-01-09 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | Use during connect the flags set with set_client_option() | Andrey Hristov | 2013-01-09 | 1 | -0/+2 |
| | | | |||||
* | | | support for password expiration in mysqlnd, through a flag | Andrey Hristov | 2013-01-09 | 2 | -1/+10 |
| | | | |||||
* | | | Add new constants | Andrey Hristov | 2013-01-09 | 1 | -1/+3 |
| | | | |||||
* | | | fix different values of mysqli_stmt_affected_rows between libmysql | Andrey Hristov | 2013-01-07 | 1 | -0/+1 |
| | | | | | | | | | | | | and mysqlnd (in favor of libmysql) before execute and after prepare() | ||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-01-06 | 37 | -37/+37 |
|\ \ \ | |/ / | |||||
| * | | bump year | Xinchen Hui | 2013-01-06 | 10 | -10/+10 |
| | | | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-01-06 | 27 | -27/+27 |
| |\ \ | | |/ | |||||
| | * | bump year | Xinchen Hui | 2013-01-06 | 27 | -27/+27 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2012-12-19 | 1 | -42/+95 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: ext/mysqlnd/mysqlnd_alloc.c | ||||
| * | | be cautious about the result of strrchr | Andrey Hristov | 2012-12-18 | 1 | -14/+84 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatoliy Belsky | 2012-12-13 | 1 | -0/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Fixed mysqlnd compilation in debug mode on windows | ||||
| * | | Fixed mysqlnd compilation in debug mode on windows | Anatoliy Belsky | 2012-12-13 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Andrey Hristov | 2012-10-31 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Andrey Hristov | 2012-10-31 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem | Andrey Hristov | 2012-10-31 | 1 | -1/+1 |
| | | | |||||
* | | | plug recent leak | Andrey Hristov | 2012-10-31 | 1 | -0/+4 |
| | | |