Skip to content
  • Luis Soares's avatar
    8c99c9c0
    Merge branch 'mysql-trunk' into mysql-trunk-wl6972 · 8c99c9c0
    Luis Soares authored
    Also fixed a small issue with the test case
    binlog_gtid_mix_response_packet (deployed a
    RESET MASTER so the test starts from a clean
    state GTID-wise).
    
    Conflicts:
    	mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result
    	sql/session_tracker.cc
    8c99c9c0
    Merge branch 'mysql-trunk' into mysql-trunk-wl6972
    Luis Soares authored
    Also fixed a small issue with the test case
    binlog_gtid_mix_response_packet (deployed a
    RESET MASTER so the test starts from a clean
    state GTID-wise).
    
    Conflicts:
    	mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result
    	sql/session_tracker.cc
Loading