diff options
| author | Xinchen Hui <laruence@php.net> | 2014-06-19 11:10:03 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-06-19 11:10:03 +0800 |
| commit | b7b5fa111b9966fa7690f9b0ab500747cdf58305 (patch) | |
| tree | e47a09f0bd87e5ab6e838ab5289ddee8e7bf324f /ext/mysqlnd/mysqlnd.c | |
| parent | 27e8e11ff97e9932957b8fd47ddc059f7f08acde (diff) | |
| download | php-git-b7b5fa111b9966fa7690f9b0ab500747cdf58305.tar.gz | |
Fixed MySQLi built with mysqlnd
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index a8881f3b1f..4f1587088a 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2729,7 +2729,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con char * name_esc = mysqlnd_escape_string_for_tx_name_in_comment(name TSRMLS_CC); query_len = mnd_sprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"), - name_esc? name_esc:"", tmp_str.s->val? tmp_str.s->val:""); + name_esc? name_esc:"", tmp_str.s? tmp_str.s->val:""); smart_str_free(&tmp_str); if (name_esc) { mnd_efree(name_esc); |