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

executor: support MAX/MIN in new evaluation framework partially #6971

Merged
merged 17 commits into from
Jul 12, 2018
Merged

executor: support MAX/MIN in new evaluation framework partially #6971

merged 17 commits into from
Jul 12, 2018

Commits on Jul 3, 2018

  1. executor: support MAX/MIN in new evaluation framework partially

    @XuHuaiyu
    XuHuaiyu committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    0904a62 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pingcap/tidb into dev/ref… 

    …actor/max_min

Conflicts:
	executor/aggfuncs/aggfuncs.go
	executor/aggfuncs/builder.go
    @XuHuaiyu
    XuHuaiyu committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    c0bef2d View commit details
    Browse the repository at this point in the history

  3. tiny change

    @XuHuaiyu
    XuHuaiyu committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    740c63c View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. address comment

    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    661dcd8 View commit details
    Browse the repository at this point in the history

  2. address comment

    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    ed6cb9d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/pingcap/tidb into dev/ref… 

    …actor/max_min

Conflicts:
	executor/aggfuncs/aggfuncs.go
    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    208e283 View commit details
    Browse the repository at this point in the history

  4. address comment

    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    4f2e0a4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into dev/refactor/max_min

    @zz-jason
    zz-jason authored Jul 11, 2018
    Configuration menu
    Copy the full SHA
    93bbe1d View commit details
    Browse the repository at this point in the history

  6. address comment

    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    f714f16 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev/refactor/max_min' of https://github.com/XuHuaiyu/tidb… 

    … into dev/refactor/max_min

:q!
    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    b14296c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/pingcap/tidb into dev/ref… 

    …actor/max_min

:q!
    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    85a7cda View commit details
    Browse the repository at this point in the history

  9. fix ci

    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    ab1895a View commit details
    Browse the repository at this point in the history

  10. address comment

    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    ec9fa07 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/pingcap/tidb into dev/ref… 

    …actor/max_min

�ý,�ý.�ý`:q!
    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    6db67e7 View commit details
    Browse the repository at this point in the history

  12. address comment

    @XuHuaiyu
    XuHuaiyu committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    cdd3980 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. Merge branch 'master' into dev/refactor/max_min

    @zz-jason
    zz-jason authored Jul 12, 2018
    Configuration menu
    Copy the full SHA
    70e5c45 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dev/refactor/max_min

    @zz-jason
    zz-jason authored Jul 12, 2018
    Configuration menu
    Copy the full SHA
    b65776e View commit details
    Browse the repository at this point in the history