knz Merge pull request #16589 from knz/20170618-cli-improv

sql/cli: restore the current database after a reconnect