Bug #60033 [NEW]: Incorrectly merged patches break uniqueidentifier column type

From: Operating system: Linux PHP version: trunk-SVN-2011-10-10 (SVN) Package: PDO related Bug Type: Bug Bug description:Incorrectly merged patches break uniqueidentifier column type Description: ------------ The following patches have been merged into trunk https://bugs.php.net/bug.php?id=50755 https://bugs.php.net/bug.php?id=54167 However they're slightly incompatible, #50755 changed the structure of the dbconvert() calls and when the merge was made the patch from #54167 wasn't updated to reflect this. With the attached patch applied the trunk driver is working great. 5.3.x is fine as the changes from #50755 aren't in that branch yet. Test script: --------------- Simply query any uniqueidentifier column value, the wrong value is returned. Expected result: ---------------- The correct value for uniqueidentifier is returned. Actual result: -------------- An unrelated sequence of bytes is encoded and returned instead of the expected uniqueidentifier. -- Edit bug report at https://bugs.php.net/bug.php?id=60033&edit=1 -- Try a snapshot (PHP 5.4): https://bugs.php.net/fix.php?id=60033&r=trysnapshot54 Try a snapshot (PHP 5.3): https://bugs.php.net/fix.php?id=60033&r=trysnapshot53 Try a snapshot (trunk): https://bugs.php.net/fix.php?id=60033&r=trysnapshottrunk Fixed in SVN: https://bugs.php.net/fix.php?id=60033&r=fixed Fixed in SVN and need be documented: https://bugs.php.net/fix.php?id=60033&r=needdocs Fixed in release: https://bugs.php.net/fix.php?id=60033&r=alreadyfixed Need backtrace: https://bugs.php.net/fix.php?id=60033&r=needtrace Need Reproduce Script: https://bugs.php.net/fix.php?id=60033&r=needscript Try newer version: https://bugs.php.net/fix.php?id=60033&r=oldversion Not developer issue: https://bugs.php.net/fix.php?id=60033&r=support Expected behavior: https://bugs.php.net/fix.php?id=60033&r=notwrong Not enough info: https://bugs.php.net/fix.php?id=60033&r=notenoughinfo Submitted twice: https://bugs.php.net/fix.php?id=60033&r=submittedtwice register_globals: https://bugs.php.net/fix.php?id=60033&r=globals PHP 4 support discontinued: https://bugs.php.net/fix.php?id=60033&r=php4 Daylight Savings: https://bugs.php.net/fix.php?id=60033&r=dst IIS Stability: https://bugs.php.net/fix.php?id=60033&r=isapi Install GNU Sed: https://bugs.php.net/fix.php?id=60033&r=gnused Floating point limitations: https://bugs.php.net/fix.php?id=60033&r=float No Zend Extensions: https://bugs.php.net/fix.php?id=60033&r=nozend MySQL Configuration Error: https://bugs.php.net/fix.php?id=60033&r=mysqlcfg