This commit was manufactured by cvs2svn to create tag 'php_5_0_1b1'.php-5.0.1b1

27 files changed, 0 insertions, 1630 deletions

diff --git a/ext/pdo_mysql/tests/connection.inc b/ext/pdo_mysql/tests/connection.inc
deleted file mode 100755
index a1b18184a9..0000000000
--- a/ext/pdo_mysql/tests/connection.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$HOST = 'localhost';
-$USER = 'root';
-$PASSWD = '';
-$DBNAME = 'test';
-
-$CONNECTION = "mysql:host=$HOST;dbname=$DBNAME";
-
-$PDO_TESTS = dirname(__FILE__) . '/../../pdo/tests/';
-
-?>
diff --git a/ext/pdo_mysql/tests/pdo_001.phpt b/ext/pdo_mysql/tests/pdo_001.phpt
deleted file mode 100755
index 4292389426..0000000000
--- a/ext/pdo_mysql/tests/pdo_001.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_ASSOC
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_001.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-array(3) {
-  [0]=>
-  array(2) {
-    ["id"]=>
-    string(1) "1"
-    ["val"]=>
-    string(1) "A"
-  }
-  [1]=>
-  array(2) {
-    ["id"]=>
-    string(1) "2"
-    ["val"]=>
-    string(1) "B"
-  }
-  [2]=>
-  array(2) {
-    ["id"]=>
-    string(1) "3"
-    ["val"]=>
-    string(1) "C"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_002.phpt b/ext/pdo_mysql/tests/pdo_002.phpt
deleted file mode 100755
index c2fa867582..0000000000
--- a/ext/pdo_mysql/tests/pdo_002.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_NUM
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_002.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(1) "1"
-    [1]=>
-    string(1) "A"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "2"
-    [1]=>
-    string(1) "B"
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "3"
-    [1]=>
-    string(1) "C"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_003.phpt b/ext/pdo_mysql/tests/pdo_003.phpt
deleted file mode 100755
index 09a803c355..0000000000
--- a/ext/pdo_mysql/tests/pdo_003.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_BOTH
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_003.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-array(3) {
-  [0]=>
-  array(4) {
-    ["id"]=>
-    string(1) "1"
-    [0]=>
-    string(1) "1"
-    ["val"]=>
-    string(1) "A"
-    [1]=>
-    string(1) "A"
-  }
-  [1]=>
-  array(4) {
-    ["id"]=>
-    string(1) "2"
-    [0]=>
-    string(1) "2"
-    ["val"]=>
-    string(1) "B"
-    [1]=>
-    string(1) "B"
-  }
-  [2]=>
-  array(4) {
-    ["id"]=>
-    string(1) "3"
-    [0]=>
-    string(1) "3"
-    ["val"]=>
-    string(1) "C"
-    [1]=>
-    string(1) "C"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_004.phpt b/ext/pdo_mysql/tests/pdo_004.phpt
deleted file mode 100755
index 4a00ed2274..0000000000
--- a/ext/pdo_mysql/tests/pdo_004.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_OBJ
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_004.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(3) {
-  [0]=>
-  object(stdClass)#%d (2) {
-    ["id"]=>
-    string(1) "1"
-    ["val"]=>
-    string(1) "A"
-  }
-  [1]=>
-  object(stdClass)#%d (2) {
-    ["id"]=>
-    string(1) "2"
-    ["val"]=>
-    string(1) "B"
-  }
-  [2]=>
-  object(stdClass)#%d (2) {
-    ["id"]=>
-    string(1) "3"
-    ["val"]=>
-    string(1) "C"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_005.phpt b/ext/pdo_mysql/tests/pdo_005.phpt
deleted file mode 100755
index 8b93ffd230..0000000000
--- a/ext/pdo_mysql/tests/pdo_005.phpt
+++ /dev/null
@@ -1,120 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_CLASS
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_005.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(3) {
-  [0]=>
-  object(stdClass)#%d (3) {
-    ["id"]=>
-    string(1) "1"
-    ["val"]=>
-    string(1) "A"
-    ["val2"]=>
-    string(2) "AA"
-  }
-  [1]=>
-  object(stdClass)#%d (3) {
-    ["id"]=>
-    string(1) "2"
-    ["val"]=>
-    string(1) "B"
-    ["val2"]=>
-    string(2) "BB"
-  }
-  [2]=>
-  object(stdClass)#%d (3) {
-    ["id"]=>
-    string(1) "3"
-    ["val"]=>
-    string(1) "C"
-    ["val2"]=>
-    string(2) "CC"
-  }
-}
-array(3) {
-  [0]=>
-  object(TestBase)#%d (3) {
-    ["id"]=>
-    string(1) "1"
-    ["val:protected"]=>
-    string(1) "A"
-    ["val2:private"]=>
-    string(2) "AA"
-  }
-  [1]=>
-  object(TestBase)#%d (3) {
-    ["id"]=>
-    string(1) "2"
-    ["val:protected"]=>
-    string(1) "B"
-    ["val2:private"]=>
-    string(2) "BB"
-  }
-  [2]=>
-  object(TestBase)#%d (3) {
-    ["id"]=>
-    string(1) "3"
-    ["val:protected"]=>
-    string(1) "C"
-    ["val2:private"]=>
-    string(2) "CC"
-  }
-}
-TestDerived::__construct(0,1)
-TestDerived::__construct(1,2)
-TestDerived::__construct(2,3)
-array(3) {
-  [0]=>
-  object(TestDerived)#%d (5) {
-    ["row:protected"]=>
-    int(0)
-    ["id"]=>
-    string(1) "1"
-    ["val:protected"]=>
-    string(1) "A"
-    ["val2:private"]=>
-    NULL
-    ["val2"]=>
-    string(2) "AA"
-  }
-  [1]=>
-  object(TestDerived)#%d (5) {
-    ["row:protected"]=>
-    int(1)
-    ["id"]=>
-    string(1) "2"
-    ["val:protected"]=>
-    string(1) "B"
-    ["val2:private"]=>
-    NULL
-    ["val2"]=>
-    string(2) "BB"
-  }
-  [2]=>
-  object(TestDerived)#%d (5) {
-    ["row:protected"]=>
-    int(2)
-    ["id"]=>
-    string(1) "3"
-    ["val:protected"]=>
-    string(1) "C"
-    ["val2:private"]=>
-    NULL
-    ["val2"]=>
-    string(2) "CC"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_006.phpt b/ext/pdo_mysql/tests/pdo_006.phpt
deleted file mode 100755
index 06da90a71d..0000000000
--- a/ext/pdo_mysql/tests/pdo_006.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_GROUP
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_006.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(2) {
-  ["A"]=>
-  array(2) {
-    [0]=>
-    array(1) {
-      [0]=>
-      string(1) "1"
-    }
-    [1]=>
-    array(1) {
-      [0]=>
-      string(1) "2"
-    }
-  }
-  ["C"]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      string(1) "3"
-    }
-  }
-}
-array(2) {
-  ["A"]=>
-  array(2) {
-    [0]=>
-    array(1) {
-      ["id"]=>
-      string(1) "1"
-    }
-    [1]=>
-    array(1) {
-      ["id"]=>
-      string(1) "2"
-    }
-  }
-  ["C"]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      ["id"]=>
-      string(1) "3"
-    }
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_007.phpt b/ext/pdo_mysql/tests/pdo_007.phpt
deleted file mode 100755
index 0fb9fb0489..0000000000
--- a/ext/pdo_mysql/tests/pdo_007.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_UNIQUE
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_007.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(3) {
-  ["A"]=>
-  array(1) {
-    [0]=>
-    string(1) "A"
-  }
-  ["B"]=>
-  array(1) {
-    [0]=>
-    string(1) "A"
-  }
-  ["C"]=>
-  array(1) {
-    [0]=>
-    string(1) "C"
-  }
-}
-array(3) {
-  ["A"]=>
-  array(1) {
-    ["val"]=>
-    string(1) "A"
-  }
-  ["B"]=>
-  array(1) {
-    ["val"]=>
-    string(1) "A"
-  }
-  ["C"]=>
-  array(1) {
-    ["val"]=>
-    string(1) "C"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_008.phpt b/ext/pdo_mysql/tests/pdo_008.phpt
deleted file mode 100755
index e185b2399d..0000000000
--- a/ext/pdo_mysql/tests/pdo_008.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_UNIQUE conflict
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_008.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(2) {
-  ["A"]=>
-  array(1) {
-    [0]=>
-    string(1) "B"
-  }
-  ["C"]=>
-  array(1) {
-    [0]=>
-    string(1) "C"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_009.phpt b/ext/pdo_mysql/tests/pdo_009.phpt
deleted file mode 100755
index 39ac93d178..0000000000
--- a/ext/pdo_mysql/tests/pdo_009.phpt
+++ /dev/null
@@ -1,89 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_CLASSTYPE
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_009.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(4) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(8) "stdClass"
-    [1]=>
-    string(1) "1"
-    [2]=>
-    string(1) "A"
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    string(5) "Test1"
-    [1]=>
-    string(1) "2"
-    [2]=>
-    string(1) "B"
-  }
-  [2]=>
-  array(3) {
-    [0]=>
-    string(5) "Test2"
-    [1]=>
-    string(1) "3"
-    [2]=>
-    string(1) "C"
-  }
-  [3]=>
-  array(3) {
-    [0]=>
-    NULL
-    [1]=>
-    string(1) "4"
-    [2]=>
-    string(1) "D"
-  }
-}
-Test1::__construct()
-Test2::__construct()
-Test3::__construct()
-array(4) {
-  [0]=>
-  object(stdClass)#%d (2) {
-    ["id"]=>
-    string(1) "1"
-    ["val"]=>
-    string(1) "A"
-  }
-  [1]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "2"
-    ["val"]=>
-    string(1) "B"
-  }
-  [2]=>
-  object(Test2)#%d (2) {
-    ["id"]=>
-    string(1) "3"
-    ["val"]=>
-    string(1) "C"
-  }
-  [3]=>
-  object(Test3)#%d (2) {
-    ["id"]=>
-    string(1) "4"
-    ["val"]=>
-    string(1) "D"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_010.phpt b/ext/pdo_mysql/tests/pdo_010.phpt
deleted file mode 100755
index 606a5e8b0c..0000000000
--- a/ext/pdo_mysql/tests/pdo_010.phpt
+++ /dev/null
@@ -1,76 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_(CLASSTYPE and GROUP/UNIQUE)
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_010.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-Test1::__construct()
-Test2::__construct()
-Test3::__construct()
-array(2) {
-  ["Group1"]=>
-  array(2) {
-    [0]=>
-    object(stdClass)#%d (2) {
-      ["id"]=>
-      string(1) "1"
-      ["val"]=>
-      string(1) "A"
-    }
-    [1]=>
-    object(Test1)#%d (2) {
-      ["id"]=>
-      string(1) "2"
-      ["val"]=>
-      string(1) "B"
-    }
-  }
-  ["Group2"]=>
-  array(2) {
-    [0]=>
-    object(Test2)#%d (2) {
-      ["id"]=>
-      string(1) "3"
-      ["val"]=>
-      string(1) "C"
-    }
-    [1]=>
-    object(Test3)#%d (2) {
-      ["id"]=>
-      string(1) "4"
-      ["val"]=>
-      string(1) "D"
-    }
-  }
-}
-Test1::__construct()
-Test2::__construct()
-Test3::__construct()
-array(2) {
-  ["Group1"]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "2"
-    ["val"]=>
-    string(1) "B"
-  }
-  ["Group2"]=>
-  object(Test3)#%d (2) {
-    ["id"]=>
-    string(1) "4"
-    ["val"]=>
-    string(1) "D"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_011.phpt b/ext/pdo_mysql/tests/pdo_011.phpt
deleted file mode 100755
index 667dc48d9e..0000000000
--- a/ext/pdo_mysql/tests/pdo_011.phpt
+++ /dev/null
@@ -1,181 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_FUNC and statement overloading
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_011.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-Test1::__construct(0,0)
-test(1,N/A)
-test(2,N/A)
-test(3,N/A)
-test(4,N/A)
-array(2) {
-  ["Group1"]=>
-  array(2) {
-    [0]=>
-    array(1) {
-      [1]=>
-      string(3) "N/A"
-    }
-    [1]=>
-    array(1) {
-      [2]=>
-      string(3) "N/A"
-    }
-  }
-  ["Group2"]=>
-  array(2) {
-    [0]=>
-    array(1) {
-      [3]=>
-      string(3) "N/A"
-    }
-    [1]=>
-    array(1) {
-      [4]=>
-      string(3) "N/A"
-    }
-  }
-}
-test(1,A)
-test(2,B)
-test(3,C)
-test(4,D)
-array(4) {
-  [0]=>
-  array(1) {
-    [1]=>
-    string(1) "A"
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    string(1) "B"
-  }
-  [2]=>
-  array(1) {
-    [3]=>
-    string(1) "C"
-  }
-  [3]=>
-  array(1) {
-    [4]=>
-    string(1) "D"
-  }
-}
-Test1::factory(1,A)
-Test1::__construct(1,A)
-Test1::factory(2,B)
-Test1::__construct(2,B)
-Test1::factory(3,C)
-Test1::__construct(3,C)
-Test1::factory(4,D)
-Test1::__construct(4,D)
-array(4) {
-  [0]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "1"
-    ["val"]=>
-    string(1) "A"
-  }
-  [1]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "2"
-    ["val"]=>
-    string(1) "B"
-  }
-  [2]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "3"
-    ["val"]=>
-    string(1) "C"
-  }
-  [3]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "4"
-    ["val"]=>
-    string(1) "D"
-  }
-}
-Test1::factory(1,A)
-Test1::__construct(1,A)
-Test1::factory(2,B)
-Test1::__construct(2,B)
-Test1::factory(3,C)
-Test1::__construct(3,C)
-Test1::factory(4,D)
-Test1::__construct(4,D)
-array(4) {
-  [0]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "1"
-    ["val"]=>
-    string(1) "A"
-  }
-  [1]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "2"
-    ["val"]=>
-    string(1) "B"
-  }
-  [2]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "3"
-    ["val"]=>
-    string(1) "C"
-  }
-  [3]=>
-  object(Test1)#%d (2) {
-    ["id"]=>
-    string(1) "4"
-    ["val"]=>
-    string(1) "D"
-  }
-}
-DerivedStatement::__construct(Overloaded)
-string(16) "DerivedStatement"
-DerivedStatement::retrieve(1,A)
-DerivedStatement::retrieve(2,B)
-DerivedStatement::retrieve(3,C)
-DerivedStatement::retrieve(4,D)
-array(4) {
-  [0]=>
-  array(1) {
-    [1]=>
-    string(1) "A"
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    string(1) "B"
-  }
-  [2]=>
-  array(1) {
-    [3]=>
-    string(1) "C"
-  }
-  [3]=>
-  array(1) {
-    [4]=>
-    string(1) "D"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_012.phpt b/ext/pdo_mysql/tests/pdo_012.phpt
deleted file mode 100755
index c238475720..0000000000
--- a/ext/pdo_mysql/tests/pdo_012.phpt
+++ /dev/null
@@ -1,70 +0,0 @@
---TEST--
-PDO_MySQL: PDOStatement::setFetchMode
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_012.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(6) "Group1"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "B"
-    [1]=>
-    string(6) "Group2"
-  }
-}
-Test::__construct(N/A)
-Test::__construct(N/A)
-array(2) {
-  [0]=>
-  object(Test)#%d (2) {
-    ["val"]=>
-    string(1) "A"
-    ["grp"]=>
-    string(6) "Group1"
-  }
-  [1]=>
-  object(Test)#%d (2) {
-    ["val"]=>
-    string(1) "B"
-    ["grp"]=>
-    string(6) "Group2"
-  }
-}
-Test::__construct(Changed)
-Test::__construct(Changed)
-array(2) {
-  [0]=>
-  object(Test)#%d (2) {
-    ["val"]=>
-    string(1) "A"
-    ["grp"]=>
-    string(6) "Group1"
-  }
-  [1]=>
-  object(Test)#%d (2) {
-    ["val"]=>
-    string(1) "B"
-    ["grp"]=>
-    string(6) "Group2"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_013.phpt b/ext/pdo_mysql/tests/pdo_013.phpt
deleted file mode 100755
index 0d2f8bd39e..0000000000
--- a/ext/pdo_mysql/tests/pdo_013.phpt
+++ /dev/null
@@ -1,58 +0,0 @@
---TEST--
-PDO_MySQL: PDOStatement is Traversable
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_013.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(2) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(6) "Group1"
-}
-array(2) {
-  [0]=>
-  string(1) "B"
-  [1]=>
-  string(6) "Group2"
-}
-Test::__construct(N/A)
-object(Test)#%d (2) {
-  ["val"]=>
-  string(1) "A"
-  ["grp"]=>
-  string(6) "Group1"
-}
-Test::__construct(N/A)
-object(Test)#%d (2) {
-  ["val"]=>
-  string(1) "B"
-  ["grp"]=>
-  string(6) "Group2"
-}
-Test::__construct(WOW)
-object(Test)#%d (2) {
-  ["val"]=>
-  string(1) "A"
-  ["grp"]=>
-  string(6) "Group1"
-}
-Test::__construct(WOW)
-object(Test)#%d (2) {
-  ["val"]=>
-  string(1) "B"
-  ["grp"]=>
-  string(6) "Group2"
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_014.phpt b/ext/pdo_mysql/tests/pdo_014.phpt
deleted file mode 100755
index a702c93e7d..0000000000
--- a/ext/pdo_mysql/tests/pdo_014.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-PDO_MySQL: PDOStatement and SPL Iterators
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc');
-if (!extension_loaded('SPL')) die('skip SPL not available');
-if (!class_exists('IteratorIterator')) die ('skip Class IteratorIterator does not exist');
-?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_014.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-Test::__construct(WOW)
-object(Test)#4 (2) {
-  ["val"]=>
-  string(1) "A"
-  ["grp"]=>
-  string(6) "Group1"
-}
-Test::__construct(WOW)
-object(Test)#6 (2) {
-  ["val"]=>
-  string(1) "B"
-  ["grp"]=>
-  string(6) "Group2"
-}
-NULL
-bool(false)
-PDOStatementAggregate::__construct
-PDOStatementAggregate::getIterator
-array(2) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(6) "Group1"
-}
-array(2) {
-  [0]=>
-  string(1) "B"
-  [1]=>
-  string(6) "Group2"
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_015.phpt b/ext/pdo_mysql/tests/pdo_015.phpt
deleted file mode 100755
index a7974b51b9..0000000000
--- a/ext/pdo_mysql/tests/pdo_015.phpt
+++ /dev/null
@@ -1,76 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_COLUMN
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc');
-?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_015.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-array(2) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-}
-array(2) {
-  [0]=>
-  string(2) "A2"
-  [1]=>
-  string(2) "B2"
-}
-array(2) {
-  [1]=>
-  array(1) {
-    [0]=>
-    string(1) "A"
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    string(1) "A"
-  }
-}
-array(2) {
-  [1]=>
-  string(1) "A"
-  [2]=>
-  string(1) "A"
-}
-array(2) {
-  [1]=>
-  string(1) "1"
-  [2]=>
-  string(1) "2"
-}
-array(2) {
-  [1]=>
-  string(1) "A"
-  [2]=>
-  string(1) "A"
-}
-array(2) {
-  [1]=>
-  string(2) "A2"
-  [2]=>
-  string(2) "B2"
-}
-array(1) {
-  ["A"]=>
-  array(2) {
-    [0]=>
-    string(2) "A2"
-    [1]=>
-    string(2) "B2"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_016.phpt b/ext/pdo_mysql/tests/pdo_016.phpt
deleted file mode 100755
index 1be753f306..0000000000
--- a/ext/pdo_mysql/tests/pdo_016.phpt
+++ /dev/null
@@ -1,117 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_BOUND
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc');
-?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_016.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-===INIT===
-int(1)
-int(1)
-int(1)
-string(1) "3"
-array(3) {
-  [0]=>
-  string(7) "String0"
-  [1]=>
-  string(7) "String1"
-  [2]=>
-  string(7) "String2"
-}
-===WHILE===
-array(1) {
-  [0]=>
-  string(7) "String0"
-}
-array(1) {
-  [1]=>
-  string(7) "String1"
-}
-array(1) {
-  [2]=>
-  string(7) "String2"
-}
-===ALONE===
-array(1) {
-  [0]=>
-  string(7) "String0"
-}
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-array(1) {
-  [0]=>
-  string(7) "String0"
-}
-array(1) {
-  [1]=>
-  string(7) "String1"
-}
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-array(1) {
-  [1]=>
-  string(7) "String1"
-}
-array(1) {
-  [2]=>
-  string(7) "String2"
-}
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-array(1) {
-  [2]=>
-  string(7) "String2"
-}
-===REBIND/SAME===
-array(1) {
-  [0]=>
-  string(7) "String0"
-}
-bool(true)
-bool(true)
-string(7) "String0"
-bool(true)
-bool(true)
-string(1) "0"
-array(1) {
-  [1]=>
-  string(7) "String1"
-}
-bool(true)
-bool(true)
-string(7) "String1"
-bool(true)
-bool(true)
-string(1) "1"
-array(1) {
-  [2]=>
-  string(7) "String2"
-}
-bool(true)
-bool(true)
-string(7) "String2"
-bool(true)
-bool(true)
-string(1) "2"
-===REBIND/CONFLICT===
-string(7) "String0"
-string(7) "String1"
-string(7) "String2"
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_017.phpt b/ext/pdo_mysql/tests/pdo_017.phpt
deleted file mode 100755
index 0f3275bd4d..0000000000
--- a/ext/pdo_mysql/tests/pdo_017.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-PDO_MySQL: PDO::beginTransaction / PDO::rollBack 
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc');
-?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_017.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-Counted 3 rows after insert.
-Counted 0 rows after delete.
-Counted 3 rows after rollback.
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_018.phpt b/ext/pdo_mysql/tests/pdo_018.phpt
deleted file mode 100755
index cff3ad8726..0000000000
--- a/ext/pdo_mysql/tests/pdo_018.phpt
+++ /dev/null
@@ -1,136 +0,0 @@
---TEST--
-PDO_MySQL: PDO Unserializing
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc');
-if (!interface_exists('Serializable')) die ('skip Interface Serializable does not exist');
-?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_018.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-===INIT===
-int(1)
-int(1)
-int(1)
-string(1) "3"
-array(3) {
-  [0]=>
-  string(8) "stdClass"
-  [1]=>
-  string(8) "TestBase"
-  [2]=>
-  string(11) "TestDerived"
-}
-===TYPES===
-array(4) {
-  ["stdClass"]=>
-  string(1) "0"
-  ["TestBase"]=>
-  string(1) "1"
-  ["TestDerived"]=>
-  string(1) "2"
-  ["TestLeaf"]=>
-  NULL
-}
-===INSERT===
-TestBase::serialize() = 'a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}'
-TestDerived::serialize()
-TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}'
-TestDerived::serialize()
-TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}'
-===DATA===
-array(4) {
-  [0]=>
-  NULL
-  [1]=>
-  string(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}"
-  [2]=>
-  string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
-  [3]=>
-  string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
-}
-===FAILURE===
-Exception:SQLSTATE[HY000]: General error: cannot unserialize class
-===COUNT===
-string(1) "3"
-===DATABASE===
-array(3) {
-  [0]=>
-  array(2) {
-    ["name"]=>
-    string(8) "TestBase"
-    ["val"]=>
-    string(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}"
-  }
-  [1]=>
-  array(2) {
-    ["name"]=>
-    string(11) "TestDerived"
-    ["val"]=>
-    string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
-  }
-  [2]=>
-  array(2) {
-    ["name"]=>
-    NULL
-    ["val"]=>
-    string(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
-  }
-}
-===FETCHCLASS===
-TestBase::unserialize[22](a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";})
-TestDerived::unserialize()
-TestBase::unserialize[22](a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";})
-TestDerived::unserialize()
-TestBase::unserialize[22](a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";})
-array(3) {
-  [0]=>
-  object(TestBase)#%d (3) {
-    ["BasePub"]=>
-    string(7) "#Public"
-    ["BasePro:protected"]=>
-    string(10) "#Protected"
-    ["BasePri:private"]=>
-    string(8) "#Private"
-  }
-  [1]=>
-  object(TestDerived)#%d (6) {
-    ["BasePub"]=>
-    string(14) "#DerivedPublic"
-    ["BasePro:protected"]=>
-    string(17) "#DerivdeProtected"
-    ["DerivedPub"]=>
-    string(7) "#Public"
-    ["DerivedPro:protected"]=>
-    string(10) "#Protected"
-    ["DerivedPri:private"]=>
-    string(7) "Private"
-    ["BasePri:private"]=>
-    string(7) "Private"
-  }
-  [2]=>
-  object(TestLeaf)#%d (6) {
-    ["BasePub"]=>
-    string(14) "#DerivedPublic"
-    ["BasePro:protected"]=>
-    string(17) "#DerivdeProtected"
-    ["DerivedPub"]=>
-    string(7) "#Public"
-    ["DerivedPro:protected"]=>
-    string(10) "#Protected"
-    ["DerivedPri:private"]=>
-    string(7) "Private"
-    ["BasePri:private"]=>
-    string(7) "Private"
-  }
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_019.phpt b/ext/pdo_mysql/tests/pdo_019.phpt
deleted file mode 100755
index 3b5f43984e..0000000000
--- a/ext/pdo_mysql/tests/pdo_019.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-PDO_MySQL: fetch() and while()
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc');
-?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_019.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-===INIT===
-int(1)
-int(1)
-int(1)
-int(1)
-string(1) "4"
-array(4) {
-  [0]=>
-  string(7) "String0"
-  [1]=>
-  string(7) "String1"
-  [2]=>
-  string(7) "String2"
-  [3]=>
-  string(7) "String3"
-}
-===WHILE===
-array(1) {
-  [0]=>
-  string(7) "String0"
-}
-array(1) {
-  [1]=>
-  string(7) "String1"
-}
-array(1) {
-  [2]=>
-  string(7) "String2"
-}
-array(1) {
-  [3]=>
-  string(7) "String3"
-}
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_020.phpt b/ext/pdo_mysql/tests/pdo_020.phpt
deleted file mode 100755
index 7c33a99f42..0000000000
--- a/ext/pdo_mysql/tests/pdo_020.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-PDO_MySQL: PDOStatement::columnCount
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_020.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-Counted 2 columns after select1.
-Counted 3 columns after select2.
-Counted 1 columns after select3.
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_023.phpt b/ext/pdo_mysql/tests/pdo_023.phpt
deleted file mode 100755
index ba43758a3e..0000000000
--- a/ext/pdo_mysql/tests/pdo_023.phpt
+++ /dev/null
@@ -1,60 +0,0 @@
---TEST--
-PDO_MySQL: Overloading
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_023_def.inc');
-
-$DB = NULL;
-
-$DB = new PDODatabaseX($CONNECTION);
-$DB->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING);
-
-require_once($PDO_TESTS . 'pdo_023.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-int(1)
-int(2)
-object(PDODatabaseX)#%d (2) {
-  ["test1"]=>
-  int(1)
-  ["test2"]=>
-  int(22)
-}
-PDODatabaseX::query()
-PDOStatementX::__construct()
-PDOStatementX::__destruct()
-PDODatabaseX::query()
-PDOStatementX::__construct()
-PDOStatementX::__destruct()
-PDODatabaseX::query()
-PDOStatementX::__construct()
-PDOStatementX::__destruct()
-PDODatabaseX::query()
-PDOStatementX::__construct()
-object(PDOStatementX)#%d (3) {
-  ["test1"]=>
-  int(1)
-  ["queryString"]=>
-  string(24) "SELECT val, id FROM test"
-  ["test2"]=>
-  int(22)
-}
-array(2) {
-  ["A"]=>
-  string(1) "0"
-  ["B"]=>
-  string(1) "1"
-}
-PDOStatementX::__destruct()
-PDODatabaseX::__destruct()
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_024.phpt b/ext/pdo_mysql/tests/pdo_024.phpt
deleted file mode 100755
index bf14896fcc..0000000000
--- a/ext/pdo_mysql/tests/pdo_024.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-PDO_MySQL: Bind does not convert NULL
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_024.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-bind: success
-bool(true)
-NULL
-===DONE===
diff --git a/ext/pdo_mysql/tests/pdo_025.phpt b/ext/pdo_mysql/tests/pdo_025.phpt
deleted file mode 100755
index 371dc7e9b6..0000000000
--- a/ext/pdo_mysql/tests/pdo_025.phpt
+++ /dev/null
@@ -1,68 +0,0 @@
---TEST--
-PDO_MySQL: PDO_FETCH_INTO
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_025.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-object(Test)#%d (3) {
-  ["id"]=>
-  string(2) "10"
-  ["val"]=>
-  string(3) "Abc"
-  ["val2"]=>
-  string(3) "zxy"
-}
-object(Test)#%d (3) {
-  ["id"]=>
-  string(2) "20"
-  ["val"]=>
-  string(3) "Def"
-  ["val2"]=>
-  string(3) "wvu"
-}
-object(Test)#%d (3) {
-  ["id"]=>
-  string(2) "30"
-  ["val"]=>
-  string(3) "Ghi"
-  ["val2"]=>
-  string(3) "tsr"
-}
-object(Test)#%d (3) {
-  ["id"]=>
-  string(2) "40"
-  ["val"]=>
-  string(3) "Jkl"
-  ["val2"]=>
-  string(3) "qpo"
-}
-object(Test)#%d (3) {
-  ["id"]=>
-  string(2) "50"
-  ["val"]=>
-  string(3) "Mno"
-  ["val2"]=>
-  string(3) "nml"
-}
-object(Test)#%d (3) {
-  ["id"]=>
-  string(2) "60"
-  ["val"]=>
-  string(3) "Pqr"
-  ["val2"]=>
-  string(3) "kji"
-}
-===FAIL===
-
-Fatal error: Cannot access protected property Fail::$id in %spdo_025.inc on line %d
diff --git a/ext/pdo_mysql/tests/pdo_026.phpt b/ext/pdo_mysql/tests/pdo_026.phpt
deleted file mode 100755
index 7e061d8671..0000000000
--- a/ext/pdo_mysql/tests/pdo_026.phpt
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-PDO_MySQL: Deriving PDO
---SKIPIF--
-<?php # vim:ft=php
-require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-require_once($PDO_TESTS . 'pdo_026.inc');
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECT--
-string(11) "PDODatabase"
-string(12) "PDOStatement"
-PDODatabase::query()
-PDOStatementX::__construct()
-string(13) "PDOStatementX"
-string(11) "PDODatabase"
-array(3) {
-  ["id"]=>
-  string(2) "10"
-  ["val"]=>
-  string(3) "Abc"
-  ["val2"]=>
-  string(3) "zxy"
-}
-array(3) {
-  ["id"]=>
-  string(2) "20"
-  ["val"]=>
-  string(3) "Def"
-  ["val2"]=>
-  string(3) "wvu"
-}
-array(3) {
-  ["id"]=>
-  string(2) "30"
-  ["val"]=>
-  string(3) "Ghi"
-  ["val2"]=>
-  string(3) "tsr"
-}
-===DONE===
-PDODatabase::__destruct()
-PDOStatementX::__destruct()
diff --git a/ext/pdo_mysql/tests/prepare.inc b/ext/pdo_mysql/tests/prepare.inc
deleted file mode 100755
index 7bda793609..0000000000
--- a/ext/pdo_mysql/tests/prepare.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require_once('connection.inc');
-
-$SQL = array();
-
-$DB = new pdo($CONNECTION, $USER, $PASSWD);
-
-foreach(array('test','classtypes') as $name)
-{
-	$DB->query('DROP TABLE IF EXISTS '.$name);
-}
-
-$DB->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING);
-
-?>
diff --git a/ext/pdo_mysql/tests/skipif.inc b/ext/pdo_mysql/tests/skipif.inc
deleted file mode 100755
index 70b66601a1..0000000000
--- a/ext/pdo_mysql/tests/skipif.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if (!extension_loaded('pdo_mysql')) die('skip');
-
-require_once('connection.inc');
-require_once('prepare.inc');
-
-if (!$DB) {
-	die('skip cannot open db');
-}
-
-?>