diff options
| author | Christopher Jones <sixd@php.net> | 2012-09-26 16:31:22 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-09-26 16:31:22 -0700 |
| commit | 609e375e2f8084e4765992483166ad7c136e1349 (patch) | |
| tree | 055c0c55b844de5eca1ba571dc824a93e09c6e1d /ext/mysql/php_mysql.c | |
| parent | 6ce88bbc71e81c4f367dcb7da7a9e2bf8dbd3df0 (diff) | |
| parent | da96aa848fc4845399d4d7a7c396fa31ffb9ffba (diff) | |
| download | php-git-609e375e2f8084e4765992483166ad7c136e1349.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src: (22 commits)
compile out example plugin in a release build
change public key setting to PERDIR and finish code that allows to set the key file programatically per mysqli_options()
remove old unicode code, that is was compiled out by using a macro
Add SHA256 authentication support - password hashing to mysqlnd Automatic switchover to SSL with plain-text password is not part of this
Correct the test summary
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Add NEWS/UPGRADING for previous change
Simplify set_error_handler/set_exception_handler code
Return previous error handler when resetting the error handler
Allow resetting the error handler
Revert error/exception handler changes
Fixed bug #63132
Avoid calling select if maxfd returned by curl_multi_fdset is -1
Add CURLOPT_READDATA which was removed by mistake
Fixing NEWS file
Fixed bug #63111 (is_callable() lies for abstract static method)
updated lib versions
Do not disable RFC3678 multicast API on Windows
Fix folding
...
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions