Modified prepare_view to retain indexes.
Merge branch 'working' of https://github.com/steve-wilson/mySQL into working

Also added check in finalize that drops primary key on failure.

Conflicts:
	sql/adapt_schema.cc
	sql/prepare_view.cc
	sql/sql_finalize.cc