[gentoo-commits] proj/mysql-extras:master commit in: /

[Brian Evans]

commit:     d6738091bca29969dcc43c6a0edd006c1adcfb11
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 13:54:41 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 13:54:41 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=d6738091

Fix MDEV-12261 patch which does not completely apply

 20034_all_mariadb-10.1.22-MDEV-12261.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/20034_all_mariadb-10.1.22-MDEV-12261.patch 
b/20034_all_mariadb-10.1.22-MDEV-12261.patch
index d94d8d1..66ba7e3 100644
--- a/20034_all_mariadb-10.1.22-MDEV-12261.patch
+++ b/20034_all_mariadb-10.1.22-MDEV-12261.patch
@@ -193,7 +193,7 @@ diff --git a/storage/maria/ma_delete_table.c 
b/storage/maria/ma_delete_table.c
 index a9ab8e5..186075d 100644
 --- a/storage/maria/ma_delete_table.c
 +++ b/storage/maria/ma_delete_table.c
-@@ -86,11 +86,11 @@ int maria_delete_table_files(const char *name, myf 
sync_dir)
+@@ -86,13 +86,13 @@
  {
    DBUG_ENTER("maria_delete_table_files");
  
@@ -203,10 +203,12 @@ index a9ab8e5..186075d 100644
 +      mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, 
MYF(MY_WME | sync_dir)))
      DBUG_RETURN(my_errno);
  
--  my_handler_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0));
--  my_handler_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0));
-+  mysql_file_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0));
-+  mysql_file_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0));
+   if (!temporary) {
+-    my_handler_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0));
+-    my_handler_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0));
++    mysql_file_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0));
++    mysql_file_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0));
+   }
    DBUG_RETURN(0);
  }
 diff --git a/storage/myisam/mi_delete_table.c 
b/storage/myisam/mi_delete_table.c