Everything should be good when you upgrade.

Even then you should have the wallet.dat copy incase anything goes wrong you can restore