search

facebook / mysql-5.6

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

Fix the second and third binlog.cc build failure on macOS #1423

Closed laurynas-biveinis closed 5 months ago

laurynas-biveinis commented 5 months ago

This fixes

sql/binlog.cc:6658: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)) {



sql/binlog.cc:8841: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)) {
            ~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~

Squash with c4273c9a5766f2735c0aac8492720a68662b4006
luqun commented 5 months ago

could you merge with #1422?

laurynas-biveinis commented 5 months ago

could you merge with #1422?

@luqun, the PRs are separate because they squash with different patches. Should I still merge them then?

facebook-github-bot commented 5 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 5 months ago

This pull request has been merged in facebook/mysql-5.6@1239100a12e49004ef301031de1cf25989c46900.