Column count of mysql.user is wrong. Expected 45, found 48.

[rlex]

One is ubuntu 16.04, pretty fresh machine (around 6 month or so)
Second is debian 8 now, was started… i think from debian 6 and dist-upgraded all the way to 6.
Upgrade is done with apt-get safe-upgrade, mysql_upgrade, service mysql restart