fixup! fixup! fixup! fixup! NEO: simplify dev SR with experimental RocksDB support

component/mariadb/buildout.cfg

@@ -92,7 +92,7 @@ md5sum = 8d11f4e20d3ef0bb1befe173de9213c8
 patch-options = -p0
 patches =
   ${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
-  ${:_profile_base_location_}/mariadb_10.1.22_2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb.patch#28272800ac56670ce0234bddeb9fba99
+  ${:_profile_base_location_}/mariadb_10.1.22_2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb.patch#e81b6456f8f45a89a7f2f545f548106e
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.

component/mariadb/mariadb_10.1.22_2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb.patch

@@ -174,15 +174,15 @@ diff -ur storage/maria/ma_delete_table.c storage/maria/ma_delete_table.c
  
 -  if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) ||
 -      my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir)))
-+  if (mysql_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) ||
-+      mysql_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir)))
++  if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) ||
++      mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir)))
      DBUG_RETURN(my_errno);
  
    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_handler_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0));
-+    mysql_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);
  }