| Commit message (Collapse) | Author | Age | Files | Lines |
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
a few tests failed due to knew issue, I will disscuss with dmitry later
|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
|
| | | | |
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | | |
code is used - reuse
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
ext/mysqli/mysqli_api.c
|
| | | | | |
|
| | | | | |
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
NEWS
configure.in
ext/mysqli/mysqli_api.c
main/php_version.h
|
| | | | | |
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
* PHP-5.5:
NEWS
NEWS
test for bug #66762
Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* PHP-5.4:
NEWS
test for bug #66762
Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Each new mysqli_stmt now increase the refcount of the link object.
So the link is really destroy after all statements.
Only implemented with libmysqlclient, as mysqlnd already implement
this internally.
So, libmysqlclient and mysqlnd have the same behavior.
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
|
| |/ / / |
|
| |/ / |
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| | |
Although the doc said it is (unsigned int *), but it is ulong* in the
libmysql 5.0 's source codes
|
| | |
| |
| |
| | |
using Connector/C
|
| | | |
|
| | |
| |
| |
| | |
Add support for flags and name for commit/rollback in libmysql mode
|
| |\ \
| |/ |
|
| | |
| |
| |
| | |
new constant for password expriration
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| | |
A step in the direction of keeping internal data private
|
| | |
| |
| |
| |
| |
| | |
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
|
| | |
| |
| |
| |
| | |
Since the catalog values always is "def" now, see http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html
|
| | |
| |
| |
| |
| |
| |
| | |
and out)
Actually this caused by attempt to efree a INTERNED string
|
| | |
| |
| |
| | |
mysqlnd is used
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
0x0 for some reason
|
| | | |
|
| | |
| |
| |
| | |
to set the key file programatically per mysqli_options()
|