Worked on the percona/percona-server repository to enhance stability and maintainability in the join path, focusing on database internals and performance optimization using C++. Addressed a bug by reverting a previous performance-regression fix for table joins, prioritizing correctness and long-term reliability, especially for wide-table scenarios. The approach involved removing the calculate_field_offset function and inlining its logic into rec_init_offsets_comp_ordinary, simplifying the code path and reducing maintenance risk. Documented the rationale for these changes and laid the foundation for safer future optimizations in join offset calculations, demonstrating a careful balance between performance improvements and codebase stability.