Fix mysql password. This fix got dropped somewhere.

Re-applying this fix  for the mysql password.