Added some logging and abort indexing on mysql error
Merge origin/master into 3.0