refs #6090 merge all mysql-test changes from 5.5.28 to 5.5.30

git-svn-id: file:///svn/mysql.com/mariadb-5.5.30@54905 c7de825b-a66e-492c-adef-691d508d4ae1

Conflicts:
	mysql-test/disabled.def