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 | ||||
* | 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.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 |
| | | |||||
* | | 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 | ||||
* | | Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs) | Johannes Schlüter | 2013-02-21 | 2 | -2/+2 |
| | | |||||
* | | check the validity of the parameter | Andrey Hristov | 2013-02-04 | 1 | -1/+8 |
| | | |||||
* | | 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 compilation error after merge | Andrey Hristov | 2013-01-09 | 1 | -1/+1 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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 |
| | | |||||
* | | be cautious about the result of strrchr | Andrey Hristov | 2012-12-18 | 1 | -14/+84 |
| | | |||||
* | | Fixed mysqlnd compilation in debug mode on windows | Anatoliy Belsky | 2012-12-13 | 1 | -0/+2 |
| | | |||||
* | | 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 |
| | | |||||
* | | Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode) | Xinchen Hui | 2012-07-18 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 | andrey | 2012-07-09 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fixed the common misspelling of the word occurred (occured -> occurred) | Marc Easen | 2012-06-30 | 1 | -2/+2 |
| | | | |||||
* | | | fix valgrind warning | andrey | 2012-07-09 | 1 | -1/+1 |
|/ / | |||||
* | | merge | andrey | 2012-06-29 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | andrey | 2012-06-29 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | fix Bug #62273 Segmentation Fault in Mysqli/Mysqlnd | andrey | 2012-06-29 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | andrey | 2012-06-29 | 1 | -19/+56 |
|\ \ | |/ | |||||
| * | new charsets | andrey | 2012-06-29 | 1 | -19/+56 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | andrey | 2012-05-16 | 1 | -4/+2 |
|\ \ | |/ | | | | | | | | | | | Conflicts: ext/mysqlnd/mysqlnd_ps.c merge fix for bug#62046 | ||||
| * | Fix for bug#62046 | andrey | 2012-05-16 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Fix #61704 (Crash apache, phpinfo() threading issue) | Johannes Schlüter | 2012-05-08 | 2 | -10/+33 |
| | | |||||
* | | Fix folding marks | Johannes Schlüter | 2012-05-08 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | andrey | 2012-05-02 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Fix for bug#61411 | andrey | 2012-05-02 | 1 | -2/+2 |
| | | | | | | | | | | | | Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE Wrong allocation, that doesn't follow the scheme of using stmt->persistent was the root cause of the problem and the crash at free. | ||||
* | | Fix folding | Johannes Schlüter | 2012-04-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.3' into PHP-5.4 | David Soria Parra | 2012-03-20 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | * PHP-5.3: Replace $Revision$ with $Id$ in keyword expansion enable files Enable $Id$ expansion for files with the $Revision$ keyword Conflicts: ext/mysqlnd/mysqlnd.h | ||||
| * | Replace $Revision$ with $Id$ in keyword expansion enable files | David Soria Parra | 2012-03-20 | 1 | -1/+1 |
| | | |||||
| * | assert | Andrey Hristov | 2012-02-02 | 1 | -1/+5 |
| | | |||||
| * | Fix configuration message typo and alignment (5.4 merge approved by Stas) | Christopher Jones | 2012-01-12 | 1 | -2/+2 |
| | | |||||
| * | - Year++ | Felipe Pena | 2012-01-01 | 27 | -27/+27 |
| | | |||||
| * | use the method in all builds. Thus it can be used for detection | Andrey Hristov | 2011-11-22 | 1 | -7/+0 |
| | | | | | | | | | | of state transitioning in every case | ||||
| * | move change_user closer to connect | Andrey Hristov | 2011-10-18 | 1 | -143/+138 |
| | | |||||
| * | this should be decided by configure | Andrey Hristov | 2011-10-14 | 1 | -1/+0 |
| | | |||||
| * | MYSQLND_NET refactored not to use any direct reference to MYSQLND (the ↵ | Andrey Hristov | 2011-10-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | connection) QC will need an ifdef-layer to compile with this | ||||
| * | - Fix folding | Johannes Schlüter | 2011-09-25 | 1 | -1/+1 |
| | | |||||
| * | - Fix bug #55609 (mysqlnd cannot be built shared) | Johannes Schlüter | 2011-09-06 | 2 | -3/+11 |
| | | | | | | | | | | | | | | # This adds an option --enable-mysqlnd to explicitly built mysqlnd, like any # other extension it can be used with =shared to build mysqlnd shared; # mysqlnd will implicitly enabled when requested from another extension | ||||
| * | missing from previous commit for #55582 | Andrey Hristov | 2011-09-05 | 1 | -3/+2 |
| | | |||||
| * | - Fixed bad xor in signed types due to integer promotion. | Gustavo André dos Santos Lopes | 2011-09-05 | 1 | -5/+5 |
| | | | | | | | | | | - Replaced undefined signed overflow with char -> unsigned char conversion. |