Merge branch 'hotfix/6214'

Close #6214
added sortable set list

http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-update.html
Merge branch 'hotfix/6250' into develop

Forward port #6250