Merge pull request #1 from MyCATApache/1.6

从主干合并

src/main/java/io/mycat/catlets/ShareJoin.java

@@ -1,16 +1,10 @@
 package io.mycat.catlets;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import com.alibaba.druid.sql.ast.SQLStatement;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
 import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
-
 import io.mycat.backend.mysql.nio.handler.MiddlerQueryResultHandler;
 import io.mycat.backend.mysql.nio.handler.MiddlerResultHandler;
 import io.mycat.cache.LayerCachePool;
@@ -31,6 +25,11 @@
 import io.mycat.sqlengine.SQLJobHandler;
 import io.mycat.util.ByteUtil;
 import io.mycat.util.ResultSetUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 /**  
  * 功能详细描述:分片join
  * @author sohudo[http://blog.csdn.net/wind520]
@@ -284,7 +283,7 @@ public int getFieldIndex(List<byte[]> fields,String fkey){
 		for (byte[] field :fields) {	
 			  FieldPacket fieldPacket = new FieldPacket();
 			  fieldPacket.read(field);	
-			  if (ByteUtil.getString(fieldPacket.name).equals(fkey)){
+			  if (ByteUtil.getString(fieldPacket.orgName).equals(fkey)){
 				  joinKeyType = fieldPacket.type;
 				  return i;				  
 			  }