bug #4000 "Table does not contain unique column" message appears after adding a unique column
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin