Portings from v6r10
Merge pull request #1735 from fstagni/fixesCompatibilityInnoDB

[v6r9] Portings from v6r10 - high priority