This commit was manufactured by cvs2svn to create branch 'PHP_5_0'.

diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt
new file mode 100644 (file)
index 0000000..438f4a2
--- /dev/null
+++ b/ext/mysqli/tests/061.phpt
@@ -0,0 +1,39 @@
+--TEST--
+local infile handler
+--FILE--
+<?php
+       include "connect.inc";
+
+       function my_read($fp, &$buffer, $buflen, &$error) {
+               $buffer = strrev(fread($fp, $buflen));
+               return(strlen($buffer));
+       }
+       
+       /*** test mysqli_connect 127.0.0.1 ***/
+       $link = mysqli_connect("localhost", $user, $passwd, "test");
+
+       /* create temporary file */
+       $fp = fopen("061.csv", "w");
+       fwrite($fp, "foo;bar");
+       fclose($fp);
+
+       mysqli_query($link,"DROP TABLE IF EXISTS t_061");
+       mysqli_query($link,"CREATE TABLE t_061 (c1 varchar(10), c2 varchar(10))");
+
+       mysqli_query($link, "LOAD DATA LOCAL INFILE '061.csv' INTO TABLE t_061 FIELDS TERMINATED BY ';'"); 
+
+       mysqli_set_local_infile_handler($link, "my_read");
+       mysqli_query($link, "LOAD DATA LOCAL INFILE '061.csv' INTO TABLE t_061 FIELDS TERMINATED BY ';'"); 
+
+       if ($result = mysqli_query($link, "SELECT c1,c2 FROM t_061")) {
+               while (($row = mysqli_fetch_row($result))) {
+                       printf("%s-%s\n", $row[0], $row[1]);
+               }
+               mysqli_free_result($result);
+       }
+
+       mysqli_close($link);
+?>
+--EXPECT--
+foo-bar
+rab-oof

diff --git a/ext/reflection/tests/bug29828.phpt b/ext/reflection/tests/bug29828.phpt
new file mode 100755 (executable)
index 0000000..69b6270
--- /dev/null
+++ b/ext/reflection/tests/bug29828.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Bug #29828 (Interfaces no longer work)
+--FILE--
+<?php
+
+interface Bla
+{
+       function bla();
+}
+
+class BlaMore extends Bla
+{
+       function bla()
+       {
+               echo "Hello\n";
+       }
+}
+
+$r = new ReflectionClass('BlaMore');
+
+var_dump(count($r->getMethods()));
+var_dump($r->getMethod('bla')->isConstructor());
+var_dump($r->getMethod('bla')->isAbstract());
+
+$o=new BlaMore;
+$o->bla();
+
+?>
+===DONE===
+--EXPECT--
+int(1)
+bool(false)
+bool(false)
+Hello
+===DONE===