diff options
| author | Andrey Hristov <andrey@php.net> | 2014-04-10 16:49:13 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-04-10 16:49:13 +0300 |
| commit | 090c3e87c0449e6eadf83815bb57c8a6eff4b56e (patch) | |
| tree | 946fdc55ed17d2dc07a99b388565cc96197026dd /ext/mysqlnd/mysqlnd_reverse_api.c | |
| parent | 63791d055ad64762c3f63e08ca7ad8ba1f44e0ab (diff) | |
| parent | 3204ad5858a5abc50b11b8527d22c82eb07a80cc (diff) | |
| download | php-git-090c3e87c0449e6eadf83815bb57c8a6eff4b56e.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
Diffstat (limited to 'ext/mysqlnd/mysqlnd_reverse_api.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_reverse_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_reverse_api.c b/ext/mysqlnd/mysqlnd_reverse_api.c index 669b99bf0e..d8b1a41511 100644 --- a/ext/mysqlnd/mysqlnd_reverse_api.c +++ b/ext/mysqlnd/mysqlnd_reverse_api.c @@ -61,7 +61,7 @@ PHPAPI void mysqlnd_reverse_api_register_api(MYSQLND_REVERSE_API * apiext TSRMLS_DC) { zend_hash_add(&mysqlnd_api_ext_ht, apiext->module->name, strlen(apiext->module->name) + 1, &apiext, - sizeof(MYSQLND_REVERSE_API), NULL); + sizeof(MYSQLND_REVERSE_API *), NULL); } /* }}} */ |