One pitfall I fell into is there is no password field now, it has been renamed so:
update user set password=PASSWORD("YOURPASSWORDHERE") where user='root';
Should now be:
update user set authentication_string=password('YOURPASSWORDHERE') where user='root';