Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mysql/mysql-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: trunk
Choose a base ref
...
head repository: mysql/mysql-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cluster-7.6
Choose a head ref
  • 13 commits
  • 20 files changed
  • 7 contributors

Commits on Jun 6, 2025

  1. BUG#37829550: WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS validations

    Improve WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS validations.
    
    Change-Id: I1860ede80acce348896738dd9fdc6565e9b3ac03
    nacarvalho committed Jun 6, 2025
    Configuration menu
    Copy the full SHA
    21a91a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2025

  1. Bug#38027636 Add support for cmake 4 [MySQL 5.7]

    This patch is for 5.7, which is EOL, but we would still like to be
    able to build it, to compare features/results in 5.7 vs newer
    releases.
    
    The patch disables features/policies which are no longer supported in
    cmake 4.0. In particular we disable embedded server, which depends on
    unsupported cmake policies.
    
    Change-Id: I3b0d13ab66f81529e607e712840a2df65dca2403
    Tor Didriksen committed Jun 10, 2025
    Configuration menu
    Copy the full SHA
    c4cbcd6 View commit details
    Browse the repository at this point in the history
  2. Bug #30562248 ADD SUPPORT FOR GCC AND CLANG ON SOLARIS

    Manual backport to 5.7 of parts of the original patch
    (which was pushed to 8.0.20)
    
    Change-Id: Iefbbe5c22676559b05323ff9fdfac13da35fc035
    Tor Didriksen committed Jun 10, 2025
    Configuration menu
    Copy the full SHA
    48a0edd View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2025

  1. Bug#37994985 All data nodes experienced a simultaneous restart following

                 upgrade
    
    Backport to 7.6
    
    Problem
    
     - Data node failure can result in cases where TC has no scan state,
       but NdbApi experiences protocol timeout.
     - NdbApi protocol timeout handling issues SCAN_NEXTREQ(Close)
       (As a result of work in
        Bug 37022901 Improve NdbApi Table and OI scan protocol timeout handling)
     - TC objects to protocol state misalignment and causes data node
       failure
    
    Solution
    
     - Extend work of Bug 37022901 to cover the general case of SCAN_NEXTREQ
       encountering an unexpected state at TC in the same way :
         - Log
         - Disconnect errant requesting API
         - [Disconnect errant record owning API if different]
       This handles the situation with lower impact API disconnect/reconnect
       rather than data node failures
    
     - Handle the specific case of an unexpected SCAN_NEXTREQ(Close) when the
       scan is already stateless in a lower impact way
       - Log
       - CONFirm the close
    
    Effects
    
     - Data node failures avoided
     - In this specific case, API disconnects avoided.
    
    Testing
    
      MTR test ndb_scan_protocol_timeout is extended to give coverage of this
      scenario.
    
      Details
       - Direct communication from node 1 to API blocked
       - Transaction hinted to node2, scanning data on node 1
       - Kernel side operations complete
       - API receives SCAN_TABCONF for complete data set
         (1 row from one stream)
       - API does not receive TRANSID_AI for row
       - Data node 1 restarted
       - No particular NF handling
       - API times out
       - API sends scan close as part of handling timeout
       - Transaction ids validate, but scan record state is wrong
       - TC hits require failure.
    
    Further work
    
      - Avoiding protocol timeouts :
        Bug 38010209 Data node failure can lead to Read/Scan API timeouts
    
    Change-Id: Ide0df32dffc11a971683f818b0877beda393382b
    frazerclement committed Jun 11, 2025
    Configuration menu
    Copy the full SHA
    b8a031d View commit details
    Browse the repository at this point in the history
  2. Merge branch 'mysql-5.7' into mysql-5.7-cluster-7.6

    Change-Id: I573a6db28a036d9fa2582e68b382edf7ef8fe45c
    zmur committed Jun 11, 2025
    Configuration menu
    Copy the full SHA
    4787707 View commit details
    Browse the repository at this point in the history
  3. Bug#37117875 Binlog record error when delimiter is set to other symbols

    Description:
    ------------
    When the delimiter is set to a non-default symbol and the SQL
    statement contains an unquoted semicolon (;) within a MySQL-specific
    comment, the SQL executes successfully in the source database.
    However, the binlog record becomes incomplete, leading to a syntax
    error in the replica database.
    
    Analysis:
    ------------
    When the delimiter is set to a non-default symbol and an SQL
    statement contains an unquoted semicolon within a MySQL-specific
    comment, the client transmits the entire SQL statement, including
    the MySQL-specific comment, up to the delimiter to the server.
    During parsing, the server interprets the semicolon as the end of the
    command while processing the comment, resulting in the execution of
    a partial statement. The truncated statement is then recorded in
    the binary log and propagated to the replica, leading to an error.
    
    Fix:
    ------------
    When the delimiter is set to a non-default symbol, treat
    MySQL-specific comments containing unquoted semicolons as syntax
    errors and return a parser error.
    
    Change-Id: I00d6b4ced89e79a7350c94218bf2527553054aed
    Justin Jose authored and zmur committed Jun 11, 2025
    Configuration menu
    Copy the full SHA
    5fb4b80 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'mysql-5.7' into mysql-5.7-cluster-7.6

    Change-Id: Ie1d5b9a995838e09ce2e62553c9dac2c2b455697
    zmur committed Jun 11, 2025
    Configuration menu
    Copy the full SHA
    ceecbc5 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2025

  1. Backport of WL#16949 to 5.7

    Introduced a new --commands option to mysql (default: ON) to
    disable mysql client side commands in non-interactive mode.
    
    Change-Id: Ie3e1f059bc79e87dbdab8161d7d6455f216d1a0c
    gkodinov committed Jun 12, 2025
    Configuration menu
    Copy the full SHA
    83142ca View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2025

  1. Merge branch 'mysql-5.7' into mysql-5.7-cluster-7.6

    Change-Id: Ie718f23a02989f73311ffb67f2d6c3c93aa76996
    zmur committed Jun 17, 2025
    Configuration menu
    Copy the full SHA
    0b6624e View commit details
    Browse the repository at this point in the history
  2. Raise version number before tagging 5.7.51

    Approved-by: Erlend Dahl <erlend.dahl@oracle.com>
    bjornmu committed Jun 17, 2025
    Configuration menu
    Copy the full SHA
    a897e38 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2025

  1. Merge tag 'mysql-5.7' into mysql-5.7-cluster-7.6

    Change-Id: Ie34598222bfb4debaad3f08fee83443b97de0d4f
    zmur committed Jun 18, 2025
    Configuration menu
    Copy the full SHA
    56f871c View commit details
    Browse the repository at this point in the history
  2. Update License Book

    Approved-by: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    Change-Id: I538542e710b217ead2ca4e39cb5e01cae48f6537
    bjornmu committed Jun 18, 2025
    Configuration menu
    Copy the full SHA
    263c1cb View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2025

  1. Update version number in LICENSE to 7.6.35

    Approved-by: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    Change-Id: I9a838cbba47c500d23d26d4b962e96c775639537
    (cherry picked from commit f0100d5395d160bea4274d4e43a1cdcc97c20f01)
    bjornmu authored and msprajap committed Jun 19, 2025
    Configuration menu
    Copy the full SHA
    7f900db View commit details
    Browse the repository at this point in the history
Loading