summaryrefslogtreecommitdiff
path: root/ext/mysqlnd
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2013-12-042-2/+2
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-12-042-2/+2
| |\
| | * Fix loss of precisionAndrey Hristov2013-12-042-2/+2
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2013-11-274-4/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: 5.4.24-dev now merge fix add test Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
| * | merge fixAndrey Hristov2013-11-261-13/+1
| | |
| * | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-11-264-4/+29
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: NEWS ext/mysqlnd/mysqlnd.c
| | * Fix for Bug #66141 (mysqlnd quote function is wrong with ↵Andrey Hristov2013-11-264-4/+17
| | | | | | | | | | | | NO_BACKSLASH_ESCAPES after failed query)
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-11-211-11/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.5: fixed test And here is the real fix for #66124 Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
| * | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-11-211-11/+30
| |\ \ | | |/
| | * And here is the real fix for #66124Andrey Hristov2013-11-211-11/+30
| | |
* | | Merge branch 'PHP-5.5'Xinchen Hui2013-11-051-2/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-11-051-1/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: configure.in ext/mysqlnd/mysqlnd.c main/php_version.h
| | * Typo fix: umknown -> unknownLior Kaplan2013-10-311-2/+2
| | |
| | * Merge branch 'PHP-5.4'Kalle Sommer Nielsen2013-08-051-2/+6
| | |
| * | Typo fix: umknown -> unknownMartin Hujer2013-10-311-1/+1
| | |
* | | Merge branch '2Guploads'Michael Wallner2013-08-092-118/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2Guploads: add NEWS entry; add simple test more precise condition make this work in vc11 too Use int64_t and atoll() after discussion with johannes ws Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G. unify stdint type usage
| * | | unify stdint type usageMichael Wallner2013-08-062-118/+1
| | | | | | | | | | | | | | | | if you need C99 stdint types, just include "php_stdint.h"
* | | | Merge branch 'PHP-5.5'Andrey Hristov2013-08-081-6/+13
|\ \ \ \ | | |/ / | |/| |
| * | | add some tracingAndrey Hristov2013-08-081-6/+13
| | | |
* | | | Merge branch 'PHP-5.5'Christopher Jones2013-08-061-2/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * PHP-5.5: Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
| * | Fix long-standing visual pain point: the misalignment of './configure help' ↵Christopher Jones2013-08-061-2/+2
| | | | | | | | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes.
| * | Merge branch 'PHP-5.5'Kalle Sommer Nielsen2013-08-051-2/+6
| | |
* | | Check for NULL ptr from get_stream() before passing it on to php_stream_cast()Kalle Sommer Nielsen2013-08-051-2/+6
| | |
* | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-041-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: non living code related typo fixes
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-041-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c
| | * non living code related typo fixesVeres Lajos2013-08-041-1/+1
| | |
| | * Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4Andrey Hristov2013-07-081-2/+2
| | |\ | | | | | | | | | | | | | | | | Conflicts: NEWS
| * | \ Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5Andrey Hristov2013-07-081-2/+2
| |\ \ \
* | | | | Disable a flagAndrey Hristov2013-07-221-1/+1
| | | | |
* | | | | Merge branch 'master' of ssh://git.php.net/php-srcAndrey Hristov2013-07-081-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-07-031-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Make sure return value is initialised in case transaction startup failsJohannes Schlüter2013-07-031-2/+2
| | | |
* | | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-07-081-0/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| Conflicts: NEWS
| * | Fixed segfault in mysqlnd when doing long prepareAndrey Hristov2013-07-081-0/+1
| |/
| * Merge branch 'pull-request/341'Stanislav Malyshev2013-06-102-3/+3
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-102-3/+3
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | updatesAndrey Hristov2013-05-211-1/+1
| |
* | don't include smart_str.h in a too global header, fixes #64718Johannes Schlüter2013-04-302-1/+2
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-04-271-0/+1
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-04-271-0/+1
| |\
| | * Fix memory realted to #64726Xinchen Hui2013-04-271-0/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-04-191-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Andrey Hristov2013-04-191-1/+1
| |\ \ | | |/
| | * lower the limit, should fit in a byteAndrey Hristov2013-04-191-1/+1
| | |
* | | Fix some errors in mysqlnd charset listNikita Popov2013-03-241-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 fixAndrey Hristov2013-03-131-2/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-03-131-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: NEWS
| * | Merge branch 'PHP-5.3' into PHP-5.4Andrey Hristov2013-03-131-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: NEWS
| | * fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for ↵Andrey Hristov2013-03-131-1/+1
| | | | | | | | | | | | stmt->param_bind
* | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-02-212-2/+2
|\ \ \ | |/ /
View Lorry Controller Status