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.

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

dev union #321

Merged
merged 6 commits into from
Oct 8, 2015
Merged

dev union #321

merged 6 commits into from
Oct 8, 2015

Conversation

siddontang
Copy link
Member

  • support order by and limit in union
  • subselect support union
  • handle different all/distinct union option

@shenli
Copy link
Member

shenli commented Oct 8, 2015

LGTM

siddontang added a commit that referenced this pull request Oct 8, 2015
@siddontang siddontang merged commit 2e6fd07 into master Oct 8, 2015
@siddontang siddontang deleted the siddontang/dev-union branch October 8, 2015 07:26
xhebox pushed a commit to xhebox/tidb that referenced this pull request Sep 28, 2021
xhebox pushed a commit to xhebox/tidb that referenced this pull request Oct 8, 2021
guo-shaoge pushed a commit to guo-shaoge/tidb that referenced this pull request Mar 20, 2023
rleungx pushed a commit to rleungx/tidb that referenced this pull request Feb 26, 2024
* default resource group (pingcap#245)

* default resource group

Signed-off-by: disksing <[email protected]>

* enable resource control

Signed-off-by: disksing <[email protected]>

* add comments

Signed-off-by: disksing <[email protected]>

* move DefaultResourceGroup to config

Signed-off-by: disksing <[email protected]>

---------

Signed-off-by: disksing <[email protected]>
Co-authored-by: zzm <[email protected]>

* Resource Control: fix segmentation violation when keyspace not set (pingcap#251)

* fix segmentation violation when setting up ru

Signed-off-by: David <[email protected]>

* only setup resource control when cluster id not empty

Signed-off-by: David <[email protected]>

---------

Signed-off-by: David <[email protected]>

* skip ur (pingcap#279)

Signed-off-by: ystaticy <[email protected]>

* disable resource group sql interface (pingcap#309)

Signed-off-by: disksing <[email protected]>

* *: update pd client and increase maxWaitDuration (pingcap#321)

Signed-off-by: disksing <[email protected]>

* update pd client and ru config (pingcap#325)

Signed-off-by: disksing <[email protected]>

* update max wait duration (pingcap#351)

Signed-off-by: disksing <[email protected]>

* update the pd client and client go (pingcap#419)

Signed-off-by: nolouch <[email protected]>

* update main

Signed-off-by: disksing <[email protected]>

---------

Signed-off-by: disksing <[email protected]>
Signed-off-by: David <[email protected]>
Signed-off-by: ystaticy <[email protected]>
Signed-off-by: nolouch <[email protected]>
Co-authored-by: zzm <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: ystaticy <[email protected]>
Co-authored-by: ShuNing <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants