In case anything fails with the automatic upgrade through tiki-install.php, you can manually upgrade the database.
If you prefer to do on the command line, you can also use:
php installer/shell.php
At the end, you should manually create a file called "lock" inside the db/ folder where your local.php file is stored, in order to secure your installation.