debugging

Author: devnexen

ext/mysqli/mysqli_api.c

@@ -1058,9 +1058,9 @@ PHP_FUNCTION(mysqli_kill)
 	char query[64];
 	snprintf(query, sizeof(query), "KILL CONNECTION " ZEND_LONG_FMT, processid);
 
-	// 1317 is ER_QUERY_INTERRUPTED from server's side
-	if (mysql_real_query(mysql->mysql, query, strlen(query)) && mysql_errno(mysql->mysql) != 1317) {
-		if (!mysql_kill(mysql->mysql, processid)) {
+	if (mysql_real_query(mysql->mysql, query, strlen(query))) {
+		// 1317 is ER_QUERY_INTERRUPTED from server's side
+		if (mysql_errno(mysql->mysql) == 1317) {
 			RETURN_TRUE;
 		}
 		MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
@@ -2002,7 +2002,7 @@ PHP_FUNCTION(mysqli_thread_id)
 	size_t query_len = strlen(query);
 
 	if (mysql_real_query(mysql->mysql, query, query_len)) {
-		goto fail;
+		RETURN_LONG((zend_long)mysql_thread_id(mysql->mysql));
 	}
 
 	result = mysql_store_result(mysql->mysql);
@@ -2018,9 +2018,6 @@ PHP_FUNCTION(mysqli_thread_id)
 	mysql_free_result(result);
 
 	RETURN_LONG(processid);
-
-fail:
-	RETURN_LONG((zend_long)mysql_thread_id(mysql->mysql));
 }
 /* }}} */
 

ext/mysqli/tests/mysqli_kill.phpt

@@ -24,7 +24,7 @@ require_once 'skipifconnectfailure.inc';
         printf("[005] Expecting boolean/any, got %s/%s\n", gettype($tmp), $tmp);
 
     if ($res = mysqli_query($link, "SELECT id FROM test LIMIT 1"))
-        pintf("[006] Expecting boolean/false, got %s/%s\n", gettype($res), $res);
+        printf("[006] Expecting boolean/false, got %s/%s\n", gettype($res), $res);
 
     var_dump($error = mysqli_error($link));
     if (!is_string($error) || ('' === $error))
@@ -103,25 +103,25 @@ object(mysqli)#%d (%d) {
     }
   }
   ["field_count"]=>
-  int(0)
+  int(1)
   ["host_info"]=>
   string(%d) "%s"
   ["info"]=>
-  %s
+  NULL
   ["insert_id"]=>
   int(0)
   ["server_info"]=>
   string(%d) "%s"
   ["server_version"]=>
   int(%d)
   ["sqlstate"]=>
-  string(5) "HY000"
+  string(%d) "%s"
   ["protocol_version"]=>
-  int(10)
+  int(%d)
   ["thread_id"]=>
   int(%d)
   ["warning_count"]=>
-  int(0)
+  int(%d)
 }
 mysqli_kill(): Argument #2 ($process_id) must be greater than 0
 array(1) {