Manual merge into 5.6.

Including added a new error for rows in wrong partition.

And using ALGORITHM = INPLACE to allow .frm only change
of KEY ALGORITHM = N
(Still only allowed when KEY ALGORITHM is not yet set).