Merge 10.11 into 11.4

sql/sql_cmd.h

@@ -137,6 +137,7 @@ public:
                                          handlerton **ha,
                                          bool tmp_table);
   bool is_set() { return m_storage_engine_name.str != NULL; }
+  const LEX_CSTRING *name() const { return &m_storage_engine_name; }
 };