svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.c mysqlnd.h mysqlnd_structs.h

andrey Fri, 25 Feb 2011 12:52:21 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=308671 Log: revert to previous behavior Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2011-02-25 12:34:00 UTC (rev 308670) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2011-02-25 12:52:21 UTC (rev 308671) @@ -2335,10 +2335,12 @@ 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; Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2011-02-25 12:34:00 UTC (rev 308670) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2011-02-25 12:52:21 UTC (rev 308671) @@ -198,9 +198,15 @@ PHPAPI void mysqlnd_set_local_infile_handler(MYSQLND * const conn, const char * const funcname); /* Simple commands */ +#if AUTOCOMMIT_TX_COMMIT_ROLLBACK #define mysqlnd_autocommit(conn, mode) (conn)->m->set_autocommit((conn), (mode) TSRMLS_CC) #define mysqlnd_commit(conn) (conn)->m->tx_commit((conn) TSRMLS_CC) #define mysqlnd_rollback(conn) (conn)->m->tx_rollback((conn) TSRMLS_CC) +#else +#define mysqlnd_autocommit(conn, mode) (conn)->m->query((conn),(mode) ? "SET AUTOCOMMIT=1":"SET AUTOCOMMIT=0", 16 TSRMLS_CC) +#define mysqlnd_commit(conn) (conn)->m->query((conn), "COMMIT", sizeof("COMMIT")-1 TSRMLS_CC) +#define mysqlnd_rollback(conn) (conn)->m->query((conn), "ROLLBACK", sizeof("ROLLBACK")-1 TSRMLS_CC) +#endif #define mysqlnd_list_dbs(conn, wild) (conn)->m->list_method((conn), wild? "SHOW DATABASES LIKE %s":"SHOW DATABASES", (wild), NULL TSRMLS_CC) #define mysqlnd_list_fields(conn, tab,wild) (conn)->m->list_fields((conn), (tab), (wild) TSRMLS_CC) #define mysqlnd_list_processes(conn) (conn)->m->list_method((conn), "SHOW PROCESSLIST", NULL, NULL TSRMLS_CC) Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2011-02-25 12:34:00 UTC (rev 308670) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2011-02-25 12:52:21 UTC (rev 308671) @@ -482,9 +482,11 @@ func_mysqlnd_conn__ssl_set ssl_set; func_mysqlnd_conn__result_init result_init; +#if AUTOCOMMIT_TX_COMMIT_ROLLBACK func_mysqlnd_conn__set_autocommit set_autocommit; func_mysqlnd_conn__tx_commit tx_commit; func_mysqlnd_conn__tx_rollback tx_rollback; +#endif };