Skip to content

Commit

Permalink
Merge pull request MyCATApache#2151 from MyCATApache/revert-2125-1.6
Browse files Browse the repository at this point in the history
Revert "删除 修改  多表查询别名问题(单库分片涉及分片的表)"
  • Loading branch information
apachemycat authored Mar 21, 2019
2 parents 8bf9c79 + de214ad commit fb1d70e
Show file tree
Hide file tree
Showing 8 changed files with 5,604 additions and 5,846 deletions.
1,416 changes: 707 additions & 709 deletions src/main/java/io/mycat/backend/mysql/nio/MySQLConnection.java

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions src/main/java/io/mycat/route/RouteResultset.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ public final class RouteResultset implements Serializable {

private boolean selectForUpdate;
private boolean autoIncrement;

private Map<String, List<String>> subTableMaps;

public boolean isSelectForUpdate() {
return selectForUpdate;
Expand Down Expand Up @@ -449,15 +447,4 @@ public void setAutoIncrement(boolean b) {
public boolean getAutoIncrement() {
return autoIncrement;
}

public Map<String, List<String>> getSubTableMaps() {
return subTableMaps;
}

public void setSubTableMaps(Map<String, List<String>> subTableMaps) {
this.subTableMaps = subTableMaps;
}



}
Loading

0 comments on commit fb1d70e

Please sign in to comment.