Export new calls

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 0e47def6d13fedb8d0cb859944e68bcf86c48961..959f3e0256128c4aa36099e9d30727804ca6f7a5 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2761,9 +2761,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsi
 /* }}} */
 
 
-typedef enum_func_status       (*func_mysqlnd_conn_data__)(MYSQLND_CONN_DATA * conn, const unsigned int flags, const char * const name TSRMLS_DC);
-
-
 /* {{{ mysqlnd_conn_data::local_tx_start */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn_data, local_tx_start)(MYSQLND_CONN_DATA * conn, size_t this_func TSRMLS_DC)

diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index bf0f70b405c26d24b12cb948d3c02b29bf442924..7adf3b6840d2939da72dcede582f294bb76f3009 100644 (file)
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -192,8 +192,9 @@ PHPAPI void mysqlnd_set_local_infile_handler(MYSQLND_CONN_DATA * const conn, con
 
 /* Simple commands */
 #define mysqlnd_autocommit(conn, mode)         ((conn)->data)->m->set_autocommit((conn)->data, (mode) TSRMLS_CC)
-#define mysqlnd_commit(conn)                           ((conn)->data)->m->tx_commit((conn)->data TSRMLS_CC)
-#define mysqlnd_rollback(conn)                         ((conn)->data)->m->tx_rollback((conn)->data TSRMLS_CC)
+#define mysqlnd_begin_transaction(conn,flags,name) ((conn)->data)->m->tx_begin((conn)->data, (flags), (name) TSRMLS_CC)
+#define mysqlnd_commit(conn, flags, name)      ((conn)->data)->m->tx_commit_or_rollback((conn)->data, TRUE, (flags), (name) TSRMLS_CC)
+#define mysqlnd_rollback(conn, flags, name)    ((conn)->data)->m->tx_commit_or_rollback((conn)->data, FALSE, (flags), (name) TSRMLS_CC)
 #define mysqlnd_list_dbs(conn, wild)           ((conn)->data)->m->list_method((conn)->data, wild? "SHOW DATABASES LIKE %s":"SHOW DATABASES", (wild), NULL TSRMLS_CC)
 #define mysqlnd_list_fields(conn, tab,wild)    ((conn)->data)->m->list_fields((conn)->data, (tab), (wild) TSRMLS_CC)
 #define mysqlnd_list_processes(conn)           ((conn)->data)->m->list_method((conn)->data, "SHOW PROCESSLIST", NULL, NULL TSRMLS_CC)

diff --git a/ext/mysqlnd/mysqlnd_libmysql_compat.h b/ext/mysqlnd/mysqlnd_libmysql_compat.h
index e3ab9eefa99c5e6b8a4263e1d47de4909f7fe40a..516200e0d507ff4cbaa9ac6afeccaf36956d14a1 100644 (file)
--- a/ext/mysqlnd/mysqlnd_libmysql_compat.h
+++ b/ext/mysqlnd/mysqlnd_libmysql_compat.h
@@ -44,7 +44,7 @@
 #define mysql_change_user(r,a,b,c)             mysqlnd_change_user((r), (a), (b), (c), FALSE)
 #define mysql_character_set_name(c)            mysqlnd_character_set_name((c))
 #define mysql_close(r)                                 mysqlnd_close((r), MYSQLND_CLOSE_EXPLICIT)
-#define mysql_commit(r)                                        mysqlnd_commit((r))
+#define mysql_commit(r)                                        mysqlnd_commit((r), TRANS_COR_NO_OPT, NULL)
 #define mysql_data_seek(r,o)                   mysqlnd_data_seek((r),(o))
 #define mysql_debug(x)                                 mysqlnd_debug((x))
 #define mysql_dump_debug_info(r)               mysqlnd_dump_debug_info((r))
@@ -74,7 +74,7 @@
 #define mysql_real_escape_string(r,a,b,c) mysqlnd_real_escape_string((r), (a), (b), (c))
 #define mysql_real_query(r,a,b)                        mysqlnd_query((r), (a), (b))
 #define mysql_refresh(conn, options)   mysqlnd_refresh((conn), (options))
-#define mysql_rollback(r)                              mysqlnd_rollback((r))
+#define mysql_rollback(r)                              mysqlnd_rollback((r), TRANS_COR_NO_OPT, NULL)
 #define mysql_select_db(r,a)                   mysqlnd_select_db((r), (a) ,strlen((a)))
 #define mysql_set_server_option(r,o)   mysqlnd_set_server_option((r), (o))
 #define mysql_set_character_set(r,a)   mysqlnd_set_character_set((r), (a))