Merge recycle.(none):/src/bug24496/my50-bug24496

into  recycle.(none):/src/bug24496/my51-bug24496


scripts/mysql_create_system_tables.sh:
  Manual Merge

scripts/mysql_create_system_tables.sh

@@ -200,7 +200,7 @@ then
            INSERT INTO user (host,user) values ('localhost','');"
     else
       i_u="$i_u
-	   INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+	   INSERT INTO user (host,user) VALUES ('localhost','');"
     fi
   fi 
 fi