hi patrick, On Wed, Jun 17, 2009 at 03:06:52PM +1200, Patrick Li wrote: > I grabbed the latest svn code from > svn://svn.debian.org/pkg-mysql/mysql-dfsg-5.0/branches/lenny-proposed/debian > and complied against mysql-dfsg-5.0_5.0.51a.orig.tar.gz. > > I need to revert 2 hunks from > patches/65_fix_gis_functions_crash.dpatch in order for it to patch > cleanly.
hrm... it looks like this backported patch doesn't quite work. i took
a quick look and it seems that most (not all) of the changes are already
present in this version. if i try to do a reverse patch only a few
hunks don't apply, all of which are in the test directory (see below).
i'm not familiar with this particular problem fix... norbert could you
check to see if this patch is actually needed?
at this point i've heard back from a number of folks (both publically and
privately), so i feel a bit more comfortable about pushing something towards
s-p-u so i can prepare an upload as soon as we clear the air on this issue.
sean
(reverse patch output)
patch -R --dry-run -p1 < debian/patches/65_fix_gis_functions_crash.dpatch
:)
patching file mysql-test/r/gis-rtree.result
Hunk #4 FAILED at 1426.
1 out of 4 hunks FAILED -- saving rejects to file
mysql-test/r/gis-rtree.result.rej
patching file mysql-test/r/gis.result
patching file mysql-test/t/gis-rtree.test
Hunk #4 FAILED at 802.
1 out of 4 hunks FAILED -- saving rejects to file
mysql-test/t/gis-rtree.test.rej
patching file mysql-test/t/gis.test
patching file sql/item_geofunc.cc
Hunk #1 succeeded at 74 (offset 4 lines).
Hunk #2 succeeded at 87 (offset 4 lines).
Hunk #3 succeeded at 341 (offset 4 lines).
Hunk #4 succeeded at 372 (offset 4 lines).
Hunk #5 succeeded at 395 (offset 4 lines).
Hunk #6 succeeded at 410 (offset 4 lines).
signature.asc
Description: Digital signature
