I did upgrade step by step. I did not install my original database until I had completed 2.6 because the upgrade scripts throw errors if there are tables in MySQL. I saved my original database, cleared all of the tables from MySQL and then upgraded step by step.

Then when I reinstalled my original database, I get
SELECT * FROM video WHERE active=1 AND approve=1 AND type='public' ORDER by VID DESC LIMIT

You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1