Remove accidentally merged 4.0 changes
dict0dict.c:
  Remove the 4.0 fix accidentally auto-merged to 4.1
row0mysql.h, dict0dict.h:
  Remove a change auto-merged from 4.0