diff options
| author | Anatol Belski <ab@php.net> | 2014-08-16 11:16:56 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-16 11:16:56 +0200 |
| commit | f790043e30513c56f108289ec44ea6eb493f7773 (patch) | |
| tree | db11d035d21d7b099dbd3a122fc9822b8c6bbd14 /ext/mysqli/mysqli.c | |
| parent | 8ee2a4a9b5de682c0b37670e1f4f86242b1650ce (diff) | |
| parent | d790eceb01009489358c3781c94ebea3b3400f67 (diff) | |
| download | php-git-f790043e30513c56f108289ec44ea6eb493f7773.tar.gz | |
Merge branch 'master' of git.php.net:php-src
# By Keyur Govande (6) and Xinchen Hui (4)
# Via Keyur Govande (5) and Xinchen Hui (2)
* 'master' of git.php.net:php-src:
Fixed version id
Update NEWS
Update NEWS
Fix another failing test
Add NEWS
Better version checking
Better version checking
Better version checking
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index fb93095c42..02e6898f7f 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -585,7 +585,7 @@ PHP_MINIT_FUNCTION(mysqli) mysqli_object_handlers.write_property = mysqli_write_property; mysqli_object_handlers.get_property_ptr_ptr = std_hnd->get_property_ptr_ptr; mysqli_object_handlers.has_property = mysqli_object_has_property; -#if PHP_VERSION_ID >= 53000 +#if PHP_VERSION_ID >= 50300 mysqli_object_handlers.get_debug_info = mysqli_object_get_debug_info; #endif memcpy(&mysqli_object_driver_handlers, &mysqli_object_handlers, sizeof(zend_object_handlers)); |