List:Commits« Previous MessageNext Message »
From:uwendel Date:June 27 2007 1:07pm
Subject:PHP mysqlnd svn commit: r521 - trunk/tests/ext/mysql
View as plain text  
Author: uwendel
Date: 2007-06-27 15:07:41 +0200 (Wed, 27 Jun 2007)
New Revision: 521

Modified:
   trunk/tests/ext/mysql/mysql_close.phpt
   trunk/tests/ext/mysql/mysql_data_seek.phpt
   trunk/tests/ext/mysql/mysql_errno.phpt
   trunk/tests/ext/mysql/mysql_error.phpt
   trunk/tests/ext/mysql/mysql_escape_string.phpt
   trunk/tests/ext/mysql/mysql_fetch_assoc.phpt
   trunk/tests/ext/mysql/mysql_fetch_field.phpt
   trunk/tests/ext/mysql/mysql_fetch_lengths.phpt
   trunk/tests/ext/mysql/mysql_fetch_object.phpt
   trunk/tests/ext/mysql/mysql_fetch_row.phpt
   trunk/tests/ext/mysql/mysql_field_flags.phpt
   trunk/tests/ext/mysql/mysql_field_len.phpt
   trunk/tests/ext/mysql/mysql_field_name.phpt
   trunk/tests/ext/mysql/mysql_field_seek.phpt
   trunk/tests/ext/mysql/mysql_field_table.phpt
   trunk/tests/ext/mysql/mysql_field_type.phpt
   trunk/tests/ext/mysql/mysql_free_result.phpt
   trunk/tests/ext/mysql/mysql_get_client_info.phpt
   trunk/tests/ext/mysql/mysql_get_proto_info.phpt
   trunk/tests/ext/mysql/mysql_get_server_info.phpt
   trunk/tests/ext/mysql/mysql_info.phpt
   trunk/tests/ext/mysql/mysql_insert_id.phpt
   trunk/tests/ext/mysql/mysql_list_fields.phpt
   trunk/tests/ext/mysql/mysql_num_fields.phpt
   trunk/tests/ext/mysql/mysql_num_rows.phpt
   trunk/tests/ext/mysql/mysql_pconnect.phpt
   trunk/tests/ext/mysql/mysql_query.phpt
   trunk/tests/ext/mysql/mysql_real_escape_string.phpt
   trunk/tests/ext/mysql/mysql_result.phpt
   trunk/tests/ext/mysql/mysql_tablename.phpt
   trunk/tests/ext/mysql/mysql_unbuffered_query.phpt
Log:
Removing test for embedded. Fixing double include connect.inc/cannot redeclare


Modified: trunk/tests/ext/mysql/mysql_close.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_close.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_close.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_close()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_data_seek.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_data_seek.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_data_seek.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_data_seek()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_errno.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_errno.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_errno.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_errno()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_error.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_error.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_error.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_error()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_escape_string.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_escape_string.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_escape_string.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_escape_string()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_fetch_assoc.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_assoc.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_fetch_assoc.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_fetch_assoc()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_fetch_field.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_field.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_fetch_field.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_fetch_field()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_fetch_lengths.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_lengths.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_fetch_lengths.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_fetch_lengths()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_fetch_object.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_object.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_fetch_object.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_fetch_object()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_fetch_row.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_row.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_fetch_row.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_fetch_row()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_field_flags.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_flags.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_field_flags.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_field_flags()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_field_len.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_len.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_field_len.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_field_len()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_field_name.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_name.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_field_name.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_field_name()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_field_seek.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_seek.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_field_seek.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_field_seek()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_field_table.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_table.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_field_table.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_field_table()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_field_type.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_type.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_field_type.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_field_type()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_free_result.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_free_result.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_free_result.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_free_result()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_get_client_info.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_get_client_info.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_get_client_info.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_get_client_info()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_get_proto_info.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_get_proto_info.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_get_proto_info.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_get_proto_info()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include_once "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_get_server_info.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_get_server_info.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_get_server_info.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_get_server_info()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_info.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_info.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_info.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_info()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_insert_id.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_insert_id.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_insert_id.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_insert_id()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_list_fields.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_list_fields.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_list_fields.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -8,18 +8,18 @@
 
     $tmp    = NULL;   
     $link   = NULL;
-       
-    if (false !== ($tmp = @mysql_list_fields($link, $link)))
+       print "start";
+    if (false !== ($tmp = mysql_list_fields($link, $link)))
         printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);     
-            
+            print "parameter";
     require('table.inc');
-       
+       print "table.inc";
     if (!$res = mysql_list_fields($db, 'test', $link))
         printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
-     
+     print "list_fields";
     if (!($num = mysql_num_fields($res)))
         printf("[004] Empty field list? [%d] %s\n", mysql_errno($link),
mysql_error($link));
-
+print "num_fields";
         
     mysql_free_result($res);    
     mysql_close($link);

Modified: trunk/tests/ext/mysql/mysql_num_fields.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_num_fields.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_num_fields.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_num_fields()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_num_rows.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_num_rows.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_num_rows.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_num_rows()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_pconnect.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_pconnect.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_pconnect.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_pconnect()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_query.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_query.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_query.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_query()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include_once("connect.inc");

Modified: trunk/tests/ext/mysql/mysql_real_escape_string.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_real_escape_string.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_real_escape_string.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_real_escape_string()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_result.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_result.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_result.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_result()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_tablename.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_tablename.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_tablename.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,7 +2,6 @@
 mysql_tablename()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
     include "connect.inc";

Modified: trunk/tests/ext/mysql/mysql_unbuffered_query.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_unbuffered_query.phpt	2007-06-27 12:59:50 UTC (rev 520)
+++ trunk/tests/ext/mysql/mysql_unbuffered_query.phpt	2007-06-27 13:07:41 UTC (rev 521)
@@ -2,10 +2,9 @@
 mysql_unbuffered_query()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
+    include_once("connect.inc");
     
     $tmp    = NULL;   
     $link   = NULL;    

Thread
PHP mysqlnd svn commit: r521 - trunk/tests/ext/mysqluwendel27 Jun