[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_row.phpt

2008-03-18 Thread Dmitry Stogov
dmitry  Tue Mar 18 06:38:13 2008 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_fetch_row.phpt 
  Log:
  Fixed test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_row.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_row.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.3 
php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.4
--- php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.3Thu Aug  9 11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_fetch_row.phptTue Mar 18 06:38:13 2008
@@ -50,20 +50,6 @@
 Warning: mysql_fetch_row(): %d is not a valid MySQL result resource in %s on 
line %d
 bool(false)
 done!
---EXPECTF--
-[004]
-array(2) {
-  [0]=
-  string(1) 1
-  [1]=
-  string(1) a
-}
-[005]
-bool(false)
-
-Warning: mysql_fetch_row(): %d is not a valid MySQL result resource in %s on 
line %d
-bool(false)
-done!
 --UEXPECTF--
 [004]
 array(2) {
@@ -77,4 +63,4 @@
 
 Warning: mysql_fetch_row(): %d is not a valid MySQL result resource in %s on 
line %d
 bool(false)
-done!
\ No newline at end of file
+done!



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_row.phpt

2007-07-11 Thread Ulf Wendel
uw  Wed Jul 11 14:01:39 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_fetch_row.phpt 
  Log:
  Whitespace and - as usual - removing skipifemb.inc
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_row.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_row.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.1 
php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.2
--- php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.1Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_fetch_row.phptWed Jul 11 14:01:39 2007
@@ -2,37 +2,36 @@
 mysql_fetch_row()
 --SKIPIF--
 ?php require_once('skipif.inc'); ?
-?php require_once('skipifemb.inc'); ?
 --FILE--
 ?php
-include connect.inc;
+include connect.inc;
 
-$tmp= NULL;   
-$link   = NULL;
-
-if (!is_null($tmp = @mysql_fetch_row()))
-printf([001] Expecting NULL, got %s/%s\n, gettype($tmp), $tmp);
-
-if (false !== ($tmp = @mysql_fetch_row($link)))
-printf([002] Expecting boolean/false, got %s/%s\n, gettype($tmp), 
$tmp);
-
-require('table.inc');
-if (!$res = mysql_query(SELECT id, label FROM test ORDER BY id LIMIT 1, 
$link)) {
-printf([003] [%d] %s\n, mysql_errno($link), mysql_error($link));
-}
-
-print [004]\n;
-var_dump(mysql_fetch_row($res));
-
-print [005]\n;
-var_dump(mysql_fetch_row($res));
-
-mysql_free_result($res); 
-
-var_dump(mysql_fetch_row($res));
-   
-mysql_close($link);
-print done!;
+$tmp= NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_fetch_row()))
+   printf([001] Expecting NULL, got %s/%s\n, gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_fetch_row($link)))
+   printf([002] Expecting boolean/false, got %s/%s\n, gettype($tmp), 
$tmp);
+
+require('table.inc');
+if (!$res = mysql_query(SELECT id, label FROM test ORDER BY id LIMIT 1, 
$link)) {
+   printf([003] [%d] %s\n, mysql_errno($link), mysql_error($link));
+}
+
+print [004]\n;
+var_dump(mysql_fetch_row($res));
+
+print [005]\n;
+var_dump(mysql_fetch_row($res));
+
+mysql_free_result($res);
+
+var_dump(mysql_fetch_row($res));
+
+mysql_close($link);
+print done!;
 ?
 --EXPECTF--
 [004]

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php