facebook / mysql-5.6

Facebook's branch of the Oracle MySQL database. This includes MyRocks.
http://myrocks.io
Other
2.47k stars 711 forks source link

Fix build error on std::pair comparison #1412

Closed laurynas-biveinis closed 5 months ago

laurynas-biveinis commented 6 months ago

This fixes

sql/binlog.cc:6626:52: error: invalid operands to binary expression ('std::pair<int64_t, int64_t>' (aka 'pair<long long, long long>') and 'std::pair<long, long>' (aka 'pair<long, long>')) if (raft_rotate_info->ingestion_checkpoint != std::pair(-1L, -1L)) {



and

sql/binlog.cc:8809:30: error: invalid operands to binary expression ('std::pair<int64_t, int64_t>' (aka 'pair<long long, long long>') and 'std::pair<long, long>' (aka 'pair<long, long>'))
        if (param.checkpoint != std::pair(-1L, -1L)) {
            ~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~

Done in a separate commit from 2ad105fc364672361a6228238dd9523c835bf399 because of a different squash patch target.

Squash with e0c8fde56ec9777307d609a69acb5c5a92c21907
luqun commented 6 months ago

The only difference is squash commit? maybe I can force update 8.0.28 branch..

laurynas-biveinis commented 6 months ago

The only difference is squash commit? maybe I can force update 8.0.28 branch..

Yes, this one squashes to a different commit. Not sure how your trunk branches work, but a force push to a trunk is a bad idea in general case at least

facebook-github-bot commented 6 months ago

@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

facebook-github-bot commented 6 months ago

@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.