Handle error conversion code

Signed-off-by: Dirkjan Bussink <[email protected]>
vitessio · Jul 24, 2024 · 427d137 · 427d137
1 parent fd5ca47
commit 427d137
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/go/mysql/sqlerror/constants.go b/go/mysql/sqlerror/constants.go
@@ -125,6 +125,8 @@ const (
 	ERDupIndex                      = ErrorCode(1831)
 	ERInnodbReadOnly                = ErrorCode(1874)
 
+	ERVectorConversion = ErrorCode(6138)
+
 	// already exists
 	ERDbCreateExists = ErrorCode(1007)
 	ERTableExists    = ErrorCode(1050)

diff --git a/go/mysql/sqlerror/sql_error.go b/go/mysql/sqlerror/sql_error.go
@@ -245,6 +245,7 @@ var stateToMysqlCode = map[vterrors.State]mysqlCode{
 	vterrors.KillDeniedError:              {num: ERKillDenied, state: SSUnknownSQLState},
 	vterrors.BadNullError:                 {num: ERBadNullError, state: SSConstraintViolation},
 	vterrors.InvalidGroupFuncUse:          {num: ERInvalidGroupFuncUse, state: SSUnknownSQLState},
+	vterrors.VectorConversion:             {num: ERVectorConversion, state: SSUnknownSQLState},
 }
 
 func getStateToMySQLState(state vterrors.State) mysqlCode {

diff --git a/go/vt/vterrors/state.go b/go/vt/vterrors/state.go
@@ -120,6 +120,8 @@ const (
 	CharacterSetMismatch
 	WrongParametersToNativeFct
 
+	VectorConversion
+
 	// No state should be added below NumOfStates
 	NumOfStates
 )

diff --git a/go/vt/vttablet/tabletmanager/vreplication/utils.go b/go/vt/vttablet/tabletmanager/vreplication/utils.go
@@ -222,6 +222,7 @@ func isUnrecoverableError(err error) bool {
 		sqlerror.ERWrongParametersToProcedure,
 		sqlerror.ERWrongUsage,
 		sqlerror.ERWrongValue,
+		sqlerror.ERVectorConversion,
 		sqlerror.ERWrongValueCountOnRow:
 		log.Errorf("Got unrecoverable error: %v", sqlErr)
 		return true