19 Mar
2017
19 Mar
'17
1:13 p.m.
Am 19.03.2017 um 12:24 schrieb Sergei Golubchik: > On Mar 16, Reindl Harald wrote: >>> https://github.com/mariadb/server/commit/2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb.patch >> + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 >> patching file include/my_sys.h >> Hunk #1 succeeded at 646 (offset 49 lines). >> patching file include/mysql/psi/mysql_file.h >> patching file mysys/my_symlink2.c >> patching file sql/handler.cc >> Hunk #1 succeeded at 3840 (offset -10 lines). >> patching file sql/sql_db.cc >> Hunk #1 succeeded at 846 (offset 31 lines). >> Hunk #2 succeeded at 1152 (offset 33 lines). >> Hunk #3 succeeded at 1268 (offset 33 lines). >> patching file sql/table.cc >> Hunk #1 succeeded at 571 (offset 2 lines). >> patching file storage/maria/ma_delete_table.c >> Hunk #1 FAILED at 86. >> 1 out of 1 hunk FAILED -- saving rejects to file >> storage/maria/ma_delete_table.c.rej >> patching file storage/myisam/mi_delete_table.c >> error: Bad exit status from /var/tmp/rpm-tmp.oVCNOI (%prep) > > Right, sorry. It's a 10.0 patch, it needs some fixing 10.1. > Normally we just merge 10.0 into 10.1, but it'll be difficult to extract > this patch from the big merge commit. So, here I've created a 10.1 > patch for you, see it attached thank you! the patch you attached works (built on Fedora 24 and 25) tests are currently running.... Mar 19 13:06:52 Updated: 5:mariadb-libs-10.1.22-2.fc25.20170319.rh.x86_64 Mar 19 13:06:53 Updated: 5:mariadb-10.1.22-2.fc25.20170319.rh.x86_64 Mar 19 13:06:54 Updated: 5:mariadb-server-10.1.22-2.fc25.20170319.rh.x86_64 Mar 19 13:07:02 Updated: 5:mariadb-test-10.1.22-2.fc25.20170319.rh.x86_64 Mar 19 13:07:02 Updated: 5:mariadb-devel-10.1.22-2.fc25.20170319.rh.x86_64 Mar 19 13:07:02 Updated: 5:mariadb-manpages-10.1.22-2.fc25.20170319.rh.x86_64