]> granicus.if.org Git - php/commit
Merge from 5.2
authorGeorg Richter <georg@php.net>
Tue, 9 May 2006 11:27:20 +0000 (11:27 +0000)
committerGeorg Richter <georg@php.net>
Tue, 9 May 2006 11:27:20 +0000 (11:27 +0000)
commitb6d7fdf46576c36ada6d4fe602f37bf5f0553d72
tree1b424ac82f11ebdb78c192ab65e17450f9f8e2b4
parent1a0f27a7078765450102d6ece73c25f39d8082d2
Merge from 5.2
13 files changed:
ext/mysqli/mysqli.c
ext/mysqli/mysqli_api.c
ext/mysqli/mysqli_fe.c
ext/mysqli/mysqli_nonapi.c
ext/mysqli/mysqli_prop.c
ext/mysqli/mysqli_repl.c
ext/mysqli/mysqli_warning.c
ext/mysqli/php_mysqli.h
ext/mysqli/tests/002.phpt
ext/mysqli/tests/014.phpt
ext/mysqli/tests/017.phpt
ext/mysqli/tests/049.phpt
ext/mysqli/tests/bug34810.phpt