Fix get_col_charset and get_col_length when using pre_get_table_charset filter#10646

matt-h wants to merge 2 commits intoWordPress:trunkWordPress/wordpress-develop:trunkfrom

matt-h:get_col_charset_fixmatt-h/wordpress-develop:get_col_charset_fixCopy head branch name to clipboard