Merge 10.4 into 10.5

scripts/mysqld_safe.sh

@@ -23,7 +23,6 @@ numa_interleave=0
 wsrep_on=0
 dry_run=0
 defaults_group_suffix=
-ignore_unknown=1
 
 # Initial logging status: error log is not open, and not using syslog
 logging=init
@@ -371,22 +370,11 @@ parse_arguments() {
 
       --help) usage ;;
 
-      --ignore-unknown) ignore_unknown=1 ;;
-      --no-ignore-unknown|--not-ignore-unknown) ignore_unknown=0 ;;
-
       *)
-        if test $ignore_unknown -eq 0
-        then
         case "$unrecognized_handling" in
           collect) append_arg_to_args "$arg" ;;
-            complain) log_error "unknown option '$arg'"
-          esac
-        else
-          case "$arg" in
-            "--loose-"*) append_arg_to_args "$arg" ;;
-            *)           append_arg_to_args "--loose-$arg"
+          complain) log_error "unknown option '$arg'" ;;
         esac
-        fi
     esac
   done
 }

storage/innobase/fil/fil0fil.cc

@@ -1503,14 +1503,20 @@ void fil_system_t::close()
   ut_ad(!sys_space);
   ut_ad(!temp_space);
 
-	if (is_initialised()) {
-		m_initialised = false;
+  if (is_initialised())
+  {
+    m_initialised= false;
     spaces.free();
     mutex_free(&mutex);
     fil_space_crypt_cleanup();
   }
 
   ut_ad(!spaces.array);
+
+#ifdef UNIV_LINUX
+  ssd.clear();
+  ssd.shrink_to_fit();
+#endif /* UNIV_LINUX */
 }
 
 /** Opens all system tablespace data files. They stay open until the