Hi! Thanks for the fixes! Once you introduced the new helpers, please, use them. I found raw column mask usage in sql_space_column_is_in_pk(). Also, the first two hunks from the next commit does not belong to the bug, so please, move them here (I speak about alter.cc changes).