diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-01-18 13:42:19 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-01-18 13:42:19 -0800 |
| commit | cd619b47f378bc45d6f355a096e3733b02f9e5a8 (patch) | |
| tree | c5ba7943ebb7abd4df2250f17ed6e251488b3377 /ext/mysqlnd/mysqlnd_libmysql_compat.h | |
| parent | deeacc7106186470f7873b291feaca2e474b3c74 (diff) | |
| parent | cd2b03d5ae835d333bec98e62592fd149fef544c (diff) | |
| download | php-git-cd619b47f378bc45d6f355a096e3733b02f9e5a8.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #63988 (Two Date tests fail) only for PHP-5.5
- Fixed ZTS build
Dereferencing process-handles no longer waits on those processes.
revert change. now it doesn't compile again...someone should fix ext/date...
Use two dtors thus allow allocation based on the alloc model of the connection.
plug a leak - forgot ot use the dtor already written
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
Revert "Update fputcsv() to escape all characters equally."
Add support for connect attributes, as of MySQL 5.6
Bug #62489: dba_insert not working as expected
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Update README.PARAMETER_PARSING_API
Export zend_parse_parameter()
Expose zend_parse_arg() as zend_parse_parameter()
zend_parse_parameters: allow ! for non pointers
Diffstat (limited to 'ext/mysqlnd/mysqlnd_libmysql_compat.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_libmysql_compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_libmysql_compat.h b/ext/mysqlnd/mysqlnd_libmysql_compat.h index c967fb3a9f..e3ab9eefa9 100644 --- a/ext/mysqlnd/mysqlnd_libmysql_compat.h +++ b/ext/mysqlnd/mysqlnd_libmysql_compat.h @@ -106,7 +106,8 @@ #define mysql_stmt_more_results(s) mysqlnd_stmt_more_results((s)) #define mysql_thread_safe() mysqlnd_thread_safe() #define mysql_info(r) mysqlnd_info((r)) -#define mysql_options(r,a,b) mysqlnd_options((r), (a), (b)) +#define mysql_options(c,a,v) mysqlnd_options((c), (a), (v)) +#define mysql_options4(c,a,k,v) mysqlnd_options4((c), (a), (k), (v)) #define mysql_stmt_init(r) mysqlnd_stmt_init((r)) #define mysql_free_result(r) mysqlnd_free_result((r), FALSE) #define mysql_store_result(r) mysqlnd_store_result((r)) |