summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-09-26 11:28:37 +0100
committerkrakjoe <joe.watkins@live.co.uk>2014-09-26 11:28:37 +0100
commit7ceff7780e0cbe0b445a77f23596c6c3dc743605 (patch)
treeb7f71be73055b051aa1514b0deb91b44170a62a3
parente1eb8fc25769d3ed73dc804c142e86b813a2a1b6 (diff)
downloadphp-git-7ceff7780e0cbe0b445a77f23596c6c3dc743605.tar.gz
remove fetches from mysqlnd
-rw-r--r--ext/mysqlnd/mysqlnd_driver.c4
-rw-r--r--ext/mysqlnd/mysqlnd_plugin.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c
index e67d023edb..a35474b9e6 100644
--- a/ext/mysqlnd/mysqlnd_driver.c
+++ b/ext/mysqlnd/mysqlnd_driver.c
@@ -99,9 +99,7 @@ static void
mysqlnd_error_list_pdtor(void * pDest)
{
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) pDest;
-#ifdef ZTS
- TSRMLS_FETCH();
-#endif
+
DBG_ENTER("mysqlnd_error_list_pdtor");
if (element->error) {
mnd_pefree(element->error, TRUE);
diff --git a/ext/mysqlnd/mysqlnd_plugin.c b/ext/mysqlnd/mysqlnd_plugin.c
index 3bb3c05147..2d909246d0 100644
--- a/ext/mysqlnd/mysqlnd_plugin.c
+++ b/ext/mysqlnd/mysqlnd_plugin.c
@@ -130,12 +130,10 @@ mysqlnd_plugin_subsystem_end(TSRMLS_D)
/* {{{ mysqlnd_plugin_register */
PHPAPI unsigned int mysqlnd_plugin_register()
{
- TSRMLS_FETCH();
return mysqlnd_plugin_register_ex(NULL TSRMLS_CC);
}
/* }}} */
-
/* {{{ mysqlnd_plugin_register_ex */
PHPAPI unsigned int mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header * plugin TSRMLS_DC)
{