summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2011-02-25 12:52:21 +0000
committerAndrey Hristov <andrey@php.net>2011-02-25 12:52:21 +0000
commitd4a1f5ac068682f5b0bd3b9dd16878f986e5745a (patch)
treedb9ce7415b0ca532475a20b3b8f66db94ecb4576 /ext/mysqlnd/mysqlnd.c
parent113cd9dc0f133441b9790a8d13f1e843c4df707f (diff)
downloadphp-git-d4a1f5ac068682f5b0bd3b9dd16878f986e5745a.tar.gz
revert to previous behavior
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
-rw-r--r--ext/mysqlnd/mysqlnd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index b233438b14..ec804a4177 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2335,10 +2335,12 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_conn)
MYSQLND_METHOD(mysqlnd_conn, send_close),
MYSQLND_METHOD(mysqlnd_conn, ssl_set),
- mysqlnd_result_init,
- MYSQLND_METHOD(mysqlnd_conn, set_autocommit),
+ mysqlnd_result_init
+#ifdef AUTOCOMMIT_TX_COMMIT_ROLLBACK
+ ,MYSQLND_METHOD(mysqlnd_conn, set_autocommit),
MYSQLND_METHOD(mysqlnd_conn, tx_commit),
MYSQLND_METHOD(mysqlnd_conn, tx_rollback)
+#endif
MYSQLND_CLASS_METHODS_END;