Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

expensivequery: fix the issue that max_exec_time hint doesn't work if it exceeds the expensive-threshold (#17359) #17536

Merged
merged 6 commits into from
Jun 17, 2020
Merged

expensivequery: fix the issue that max_exec_time hint doesn't work if it exceeds the expensive-threshold (#17359) #17536

merged 6 commits into from
Jun 17, 2020

Commits on May 29, 2020

  1. cherry pick pingcap#17359 to release-4.0 

    Signed-off-by: sre-bot <sre-bot@pingcap.com>
    @sourcelliu @sre-bot
    sourcelliu authored and sre-bot committed May 29, 2020
    Configuration menu
    Copy the full SHA
    352217a View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. resolve conflicts

    @XuHuaiyu
    XuHuaiyu committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    82026b9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-4.0' into release-4.0-709691607daf

    @sre-bot
    sre-bot authored Jun 3, 2020
    Configuration menu
    Copy the full SHA
    dca25bf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-4.0' into release-4.0-709691607daf

    @sre-bot
    sre-bot authored Jun 3, 2020
    Configuration menu
    Copy the full SHA
    7d9fb64 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2020

  1. Merge branch 'release-4.0' into release-4.0-709691607daf

    @sre-bot
    sre-bot authored Jun 6, 2020
    Configuration menu
    Copy the full SHA
    aba2cac View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2020

  1. Merge branch 'release-4.0' into release-4.0-709691607daf

    @XuHuaiyu
    XuHuaiyu authored Jun 17, 2020
    Configuration menu
    Copy the full SHA
    e6c2b72 View commit details
    Browse the repository at this point in the history