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

Sharding proxy xa transaction #950

Merged
merged 18 commits into from
Jun 21, 2018
Merged

Sharding proxy xa transaction #950

merged 18 commits into from
Jun 21, 2018

Conversation

cherrylzhao
Copy link
Member

for upstream dev merge

tuohai666 and others added 18 commits June 19, 2018 18:15
degrade mysql-connector-java to 5.1.30
make maxWorkingThreads configurable
 into sharding-proxy-xa-transaction

# Conflicts:
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteWorker.java
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteWorker.java
@cherrylzhao cherrylzhao merged commit ba88208 into apache:sharding-proxy-xa-transaction Jun 21, 2018
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