diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index a35cc00d132..27c0f3b5bd4 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -343,7 +343,7 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL,
                              'READS_SQL_DATA',
                              'MODIFIES_SQL_DATA'
                             ) DEFAULT 'CONTAINS_SQL' NOT NULL,
-                 MODIFY body longblob DEFAULT '' NOT NULL,
+                 MODIFY body longblob NOT NULL,
                  MODIFY sql_mode
                         set('REAL_AS_FLOAT',
                             'PIPES_AS_CONCAT',
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index e3e24c1f375..fff324e139c 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -778,7 +778,8 @@ void plugin_load(void)
   if (simple_open_n_lock_tables(new_thd, &tables))
   {
     DBUG_PRINT("error",("Can't open plugin table"));
-    sql_print_error("Can't open the mysql.plugin table. Please run the mysql_upgrade script to create it.");
+    sql_print_error("Can't open the mysql.plugin table. Please "
+                    "run mysql_upgrade to create it.");
     goto end;
   }
   table= tables.table;
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 7dec58d9b6e..cacfdd5adf8 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -145,7 +145,8 @@ void udf_init()
   if (simple_open_n_lock_tables(new_thd, &tables))
   {
     DBUG_PRINT("error",("Can't open udf table"));
-    sql_print_error("Can't open the mysql.func table. Please run the mysql_upgrade script to create it.");
+    sql_print_error("Can't open the mysql.func table. Please "
+                    "run mysql_upgrade to create it.");
     goto end;
   }