debugging

Author: devnexen

ext/mysqli/mysqli_api.c

@@ -1989,23 +1989,33 @@ PHP_FUNCTION(mysqli_thread_id)
 	MYSQL_ROW       row;
 	zval		*mysql_link;
 	zend_long       processid;
+	int             r;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
 		RETURN_THROWS();
 	}
 	MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
 	static const char *query = "SELECT CONNECTION_ID()";
+	size_t query_len = strlen(query);
 
-	if (mysql_real_query(mysql->mysql, query, strlen(query))) {
-		MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
-		RETURN_LONG(-1);
+	if ((r = mysql_real_query(mysql->mysql, query, query_len))) {
+		if (r == CR_COMMANDS_OUT_OF_SYNC) {
+			if (mysql_ping(mysql->mysql) == 0) {
+				if (mysql_real_query(mysql->mysql, query, query_len)) {
+					goto fail;
+				}
+				goto process;
+			}
+		}
+		goto fail;
 	}
 
+process:
 	result = mysql_store_result(mysql->mysql);
 	if (!result) {
 		MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
-		RETURN_LONG(-1);
+		RETURN_THROWS();
 	}
 
 	row = mysql_fetch_row(result);
@@ -2015,6 +2025,10 @@ PHP_FUNCTION(mysqli_thread_id)
 	mysql_free_result(result);
 
 	RETURN_LONG(processid);
+
+fail:
+	MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
+	RETURN_THROWS();
 }
 /* }}} */