合并提交结果

zwyqz · Aug 15, 2017 · f48f67f · f48f67f
1 parent 4880cc0
commit f48f67f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/source/src/main/java/io/mycat/mycat2/MySQLSession.java b/source/src/main/java/io/mycat/mycat2/MySQLSession.java
@@ -241,24 +241,17 @@ public void close(boolean normal, String hint) {
 		super.close(normal, hint);
 		this.curSQLCommand.clearResouces(true);
 	}
-<<<<<<< HEAD
-=======
 
 	public MySQLDataSource getDatasource() {
 		SchemaBean schemaBean = this.schema;
 		MycatConfig mycatConf = (MycatConfig) ProxyRuntime.INSTANCE.getProxyConfig();
 		if (schemaBean == null) {
 			schemaBean = mycatConf.getDefaultMycatSchema();
-
-			//				ErrorPacket errorPacket = new ErrorPacket();
-			//				errorPacket.message = "no schema selected";
-			//				session.responseOKOrError(errorPacket, true);
 		}
 		DNBean dnBean = schemaBean.getDefaultDN();
 		String replica = dnBean.getMysqlReplica();
 		MySQLReplicatSet repSet = mycatConf.getMySQLReplicatSet(replica);
 		MySQLDataSource datas = repSet.getCurWriteDH();
 		return datas;
 	}
->>>>>>> 7194636beee3e7d7598895419d0d26828722d2f1
 }
diff --git a/source/src/main/java/io/mycat/mycat2/MycatCore.java b/source/src/main/java/io/mycat/mycat2/MycatCore.java
@@ -23,8 +23,6 @@
  */
 package io.mycat.mycat2;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;