Skip to content

Commit 403d4fb

Browse files
committed
Export new calls
1 parent 49e3d91 commit 403d4fb

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

ext/mysqlnd/mysqlnd.c

-3
Original file line numberDiff line numberDiff line change
@@ -2761,9 +2761,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsi
27612761
/* }}} */
27622762

27632763

2764-
typedef enum_func_status (*func_mysqlnd_conn_data__)(MYSQLND_CONN_DATA * conn, const unsigned int flags, const char * const name TSRMLS_DC);
2765-
2766-
27672764
/* {{{ mysqlnd_conn_data::local_tx_start */
27682765
static enum_func_status
27692766
MYSQLND_METHOD(mysqlnd_conn_data, local_tx_start)(MYSQLND_CONN_DATA * conn, size_t this_func TSRMLS_DC)

ext/mysqlnd/mysqlnd.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,9 @@ PHPAPI void mysqlnd_set_local_infile_handler(MYSQLND_CONN_DATA * const conn, con
192192

193193
/* Simple commands */
194194
#define mysqlnd_autocommit(conn, mode) ((conn)->data)->m->set_autocommit((conn)->data, (mode) TSRMLS_CC)
195-
#define mysqlnd_commit(conn) ((conn)->data)->m->tx_commit((conn)->data TSRMLS_CC)
196-
#define mysqlnd_rollback(conn) ((conn)->data)->m->tx_rollback((conn)->data TSRMLS_CC)
195+
#define mysqlnd_begin_transaction(conn,flags,name) ((conn)->data)->m->tx_begin((conn)->data, (flags), (name) TSRMLS_CC)
196+
#define mysqlnd_commit(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, TRUE, (flags), (name) TSRMLS_CC)
197+
#define mysqlnd_rollback(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, FALSE, (flags), (name) TSRMLS_CC)
197198
#define mysqlnd_list_dbs(conn, wild) ((conn)->data)->m->list_method((conn)->data, wild? "SHOW DATABASES LIKE %s":"SHOW DATABASES", (wild), NULL TSRMLS_CC)
198199
#define mysqlnd_list_fields(conn, tab,wild) ((conn)->data)->m->list_fields((conn)->data, (tab), (wild) TSRMLS_CC)
199200
#define mysqlnd_list_processes(conn) ((conn)->data)->m->list_method((conn)->data, "SHOW PROCESSLIST", NULL, NULL TSRMLS_CC)

ext/mysqlnd/mysqlnd_libmysql_compat.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#define mysql_change_user(r,a,b,c) mysqlnd_change_user((r), (a), (b), (c), FALSE)
4545
#define mysql_character_set_name(c) mysqlnd_character_set_name((c))
4646
#define mysql_close(r) mysqlnd_close((r), MYSQLND_CLOSE_EXPLICIT)
47-
#define mysql_commit(r) mysqlnd_commit((r))
47+
#define mysql_commit(r) mysqlnd_commit((r), TRANS_COR_NO_OPT, NULL)
4848
#define mysql_data_seek(r,o) mysqlnd_data_seek((r),(o))
4949
#define mysql_debug(x) mysqlnd_debug((x))
5050
#define mysql_dump_debug_info(r) mysqlnd_dump_debug_info((r))
@@ -74,7 +74,7 @@
7474
#define mysql_real_escape_string(r,a,b,c) mysqlnd_real_escape_string((r), (a), (b), (c))
7575
#define mysql_real_query(r,a,b) mysqlnd_query((r), (a), (b))
7676
#define mysql_refresh(conn, options) mysqlnd_refresh((conn), (options))
77-
#define mysql_rollback(r) mysqlnd_rollback((r))
77+
#define mysql_rollback(r) mysqlnd_rollback((r), TRANS_COR_NO_OPT, NULL)
7878
#define mysql_select_db(r,a) mysqlnd_select_db((r), (a) ,strlen((a)))
7979
#define mysql_set_server_option(r,o) mysqlnd_set_server_option((r), (o))
8080
#define mysql_set_character_set(r,a) mysqlnd_set_character_set((r), (a))

0 commit comments

Comments
 (0)