diff options
| author |   Brian Evans <grknight@gentoo.org> | 2017-03-16 09:54:41 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2017-03-16 09:54:41 -0400 |
| commit | d6738091bca29969dcc43c6a0edd006c1adcfb11 (patch) | |
| tree | c56a245b435a41ea88dd313bdbe730281ee2f4a8 | |
| parent | Add patch to fix building mariadb 10.1.22 under certain conditions MDEV-12261 (diff) | |
| download | mysql-extras-20170316-1355Z.tar.gz mysql-extras-20170316-1355Z.tar.bz2 mysql-extras-20170316-1355Z.zip | |
Fix MDEV-12261 patch which does not completely applymysql-extras-20170316-1355Z
| -rw-r--r-- | 20034_all_mariadb-10.1.22-MDEV-12261.patch | 12 |
1 files 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 |