diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 97f2b766a4b..56b9f12bcbf 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -33,9 +33,9 @@
 #include "ext/standard/php_smart_str.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
+
+
 #if !defined(MYSQLI_USE_MYSQLND)
-
-
 /* {{{ mysqli_tx_cor_options_to_string */
 static void mysqli_tx_cor_options_to_string(const MYSQL * const conn, smart_str * str, const unsigned int mode)
 {
@@ -101,12 +101,9 @@ static int mysqli_commit_or_rollback_libmysql(MYSQL * conn, zend_bool commit, co
 					v == ' ' ||
 					v == '=')
 				{
-					*p_copy = v;
-				} else {
-					*p_copy = '?';
+					*p_copy++ = v;
 				}
 				++p_orig;
-				++p_copy;
 			}
 			*p_copy++ = '*';
 			*p_copy++ = '/';
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 88c59a9a566..8bd35610626 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2717,12 +2717,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con
 							v == ' ' ||
 							v == '=')
 						{
-							*p_copy = v;
-						} else {
-							*p_copy = '?';
+							*p_copy++ = v;
 						}
 						++p_orig;
-						++p_copy;
 					}
 					*p_copy++ = '*';
 					*p_copy++ = '/';