fix issue related to SELECT FOR UPDATE

sijms · Mar 19, 2024 · 800bce3 · 800bce3
1 parent 495e7c6
commit 800bce3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/v2/command.go b/v2/command.go
@@ -1281,6 +1281,9 @@ func (stmt *Stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (dr
 			dataSet := &DataSet{}
 			err = stmt.read(dataSet)
 			if !errors.Is(err, network.ErrConnReset) {
+				if isBadConn(err) {
+					stmt.connection.setBad()
+				}
 				return nil, err
 			}
 		}
@@ -1294,7 +1297,6 @@ func (stmt *Stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (dr
 		if isBadConn(err) {
 			//tracer.Print("Error: ", err)
 			stmt.connection.setBad()
-			return nil, err
 		}
 		return nil, err
 	}

diff --git a/v2/data_set.go b/v2/data_set.go
@@ -54,9 +54,12 @@ func (dataSet *DataSet) load(session *network.Session) error {
 		return err
 	}
 	columnCount += num * 0x100
-	if columnCount > dataSet.columnCount {
+	if dataSet.columnCount == 0 {
 		dataSet.columnCount = columnCount
 	}
+	//if columnCount > dataSet.columnCount {
+	//	dataSet.columnCount = columnCount
+	//}
 	if len(dataSet.currentRow) != dataSet.columnCount {
 		dataSet.currentRow = make(Row, dataSet.columnCount)
 	}