From: Ulf Wendel <uw@php.net>
Date: Thu, 2 Jul 2009 07:42:48 +0000 (+0000)
Subject: MFH - Test for bug #48754
X-Git-Tag: php-5.3.1RC1~470
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed05c54d2e63650177e793af744c0b66100ab9ef;p=php

MFH - Test for bug #48754
---

diff --git a/ext/mysql/tests/mysql_list_fields.phpt b/ext/mysql/tests/mysql_list_fields.phpt
index 87b3cf6b89..3ee7751191 100644
--- a/ext/mysql/tests/mysql_list_fields.phpt
+++ b/ext/mysql/tests/mysql_list_fields.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysql_list_fields()
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -21,8 +21,20 @@ require('table.inc');
 if (!$res = mysql_list_fields($db, 'test', $link))
 	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
 
-if (!($num = mysql_num_fields($res)))
-	printf("[004] Empty field list? [%d] %s\n", mysql_errno($link), mysql_error($link));
+if (2 !== ($num = mysql_num_fields($res)))
+	printf("[004] Expecting two fields, got %d. [%d] %s\n", $num, mysql_errno($link), mysql_error($link));
+
+mysql_free_result($res);
+
+if (!mysql_query("DROP TABLE IF EXISTS test2", $link) ||
+	!mysql_query("CREATE TABLE test2(id INT)", $link))
+	printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$res = mysql_list_fields($db, 'test%', $link))
+	printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (3 !== ($num = mysql_num_fields($res)))
+	printf("[007] Expecting 3 fields from test and test2, got %d. [%d] %s\n", $num, mysql_errno($link), mysql_error($link));
 
 mysql_free_result($res);
 mysql_close($link);