From: Ulf Wendel <uw@php.net>
Date: Thu, 12 Jul 2007 13:44:00 +0000 (+0000)
Subject: 1) Whitespace/CS
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=894e5c6a5bbf6a91fdc93e5144257b08f20ee99a;p=php

1) Whitespace/CS
2) Added test for default link
---

diff --git a/ext/mysql/tests/mysql_thread_id.phpt b/ext/mysql/tests/mysql_thread_id.phpt
index a1eea70c61..6289a72375 100644
--- a/ext/mysql/tests/mysql_thread_id.phpt
+++ b/ext/mysql/tests/mysql_thread_id.phpt
@@ -4,27 +4,33 @@ mysql_thread_id()
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-    include_once "connect.inc";
-        
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    if (!is_null($tmp = @mysql_thread_id($link)))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);       
-
-    require('table.inc');    
-    
-    if (!is_int($tmp = mysql_thread_id($link)) || (0 === $tmp))
-        printf("[002] Expecting int/any but zero, got %s/%s. [%d] %s\n",
-            gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));      
-            
-    mysql_close($link);
-    
-    if (false !== ($tmp = mysql_thread_id($link)))
-        printf("[003] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-    
-    print "done!";
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_thread_id($link)))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (!is_int($id = mysql_thread_id($link)) || (0 === $id))
+	printf("[002] Expecting int/any but zero, got %s/%s. [%d] %s\n",
+		gettype($id), $id, mysql_errno($link), mysql_error($link));
+
+if (!is_int($id_def = mysql_thread_id()) || (0 === $id_def))
+	printf("[003] Expecting int/any but zero, got %s/%s. [%d] %s\n",
+		gettype($id_def), $id_def, mysql_errno(), mysql_error());
+
+assert($id === $id_def);
+
+mysql_close($link);
+
+if (false !== ($tmp = mysql_thread_id($link)))
+	printf("[003] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
 ?>
 --EXPECTF--
 Warning: mysql_thread_id(): %d is not a valid MySQL-Link resource in %s on line %d
-done!
+done!
\ No newline at end of file