-  There is no suport for DELIMITER when mysql_upgrade uses the MySQL C API direct
    instead of piping through "mysql". Thus it's not possible to change to different
   delimiters  in the upgrade SQL scripts in the future. 
 - rewrite the patch to not use multi line PROCEDURE and thus remove the need
   for using DELIMITER.
 - This version of patch is also better since it's only active when engine=ndbcluster is available
 - Other parts of mysql_system_tables_fix.sql has been rewritten in similar fashion.
 - Re: "WL7308: Refactor mysql_upgrade"