summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2013-02-07 16:24:08 +0100
committerAndrey Hristov <andrey@php.net>2013-02-07 16:24:08 +0100
commit49e3d91ad91bd3b65e2142641f80de0401396b85 (patch)
tree7dce873c10098d7391c7e04d12741bdb2092c1be /ext/mysqlnd/mysqlnd.c
parent9fb0dba4be197b677b6ff7df23a110698d12530b (diff)
downloadphp-git-49e3d91ad91bd3b65e2142641f80de0401396b85.tar.gz
Add the name in a comment at commit/rollback, if provided
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
-rw-r--r--ext/mysqlnd/mysqlnd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index d7ddcb594b..0e47def6d1 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2678,8 +2678,11 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con
smart_str_0(&tmp_str);
{
+ char * commented_name = NULL;
+ unsigned int commented_name_len = name? mnd_sprintf(&commented_name, 0, " /*%s*/", name):0;
char * query;
- unsigned int query_len = mnd_sprintf(&query, 0, (commit? "COMMIT %s":"ROLLBACK %s"), tmp_str.c? tmp_str.c:"");
+ unsigned int query_len = mnd_sprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"),
+ commented_name? commented_name:"", tmp_str.c? tmp_str.c:"");
smart_str_free(&tmp_str);
if (!query) {
@@ -2688,6 +2691,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con
}
ret = conn->m->query(conn, query, query_len TSRMLS_CC);
mnd_sprintf_free(query);
+ if (commented_name) {
+ mnd_sprintf_free(commented_name);
+ }
}
} while (0);
conn->m->local_tx_end(conn, this_func, ret TSRMLS_CC);