fix sys var set

Author: elianddb

sql/planbuilder/auth_default.go

@@ -191,7 +191,7 @@ func (h defaultAuthorizationHandler) HandleAuth(ctx *sql.Context, aqs sql.Author
 	case ast.AuthType_REPLACE:
 		privilegeTypes = []sql.PrivilegeType{sql.PrivilegeType_Insert, sql.PrivilegeType_Delete}
 	case ast.AuthType_REPLICATION:
-		hasPrivileges = state.db.UserHasPrivileges(ctx, sql.NewDynamicPrivilegedOperation(plan.DynamicPrivilege_ReplicationSlaveAdmin))
+		hasPrivileges = state.db.UserHasPrivileges(ctx, sql.NewDynamicPrivilegedOperation("replication_slave_admin"))
 	case ast.AuthType_REPLICATION_CLIENT:
 		privilegeTypes = []sql.PrivilegeType{sql.PrivilegeType_ReplicationClient}
 	case ast.AuthType_REVOKE_ALL:
@@ -215,7 +215,7 @@ func (h defaultAuthorizationHandler) HandleAuth(ctx *sql.Context, aqs sql.Author
 			state.db.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_AlterRoutine)) ||
 			state.db.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(subject, sql.PrivilegeType_Execute))
 	case ast.AuthType_SUPER:
-		hasPrivileges = state.db.UserHasPrivileges(ctx, sql.NewPrivilegedOperation(sql.PrivilegeCheckSubject{}, sql.PrivilegeType_Super))
+		privilegeTypes = []sql.PrivilegeType{sql.PrivilegeType_Super}
 	case ast.AuthType_TRIGGER:
 		privilegeTypes = []sql.PrivilegeType{sql.PrivilegeType_Trigger}
 	case ast.AuthType_UPDATE:

sql/rowexec/rel_iters.go

@@ -401,7 +401,6 @@ func setSystemVar(ctx *sql.Context, sysVar *expression.SystemVar, right sql.Expr
 
 	// Setting `character_set_connection` and `collation_connection` will set the corresponding variable
 	// Setting `character_set_server` and `collation_server` will set the corresponding variable
-	// Handle MariaDB binlog numeric conversions for sql_mode and collation IDs
 	switch strings.ToLower(sysVar.Name) {
 	case "sql_mode":
 		val, err = sql.ConvertSqlModeBitmask(val)
@@ -425,7 +424,6 @@ func setSystemVar(ctx *sql.Context, sysVar *expression.SystemVar, right sql.Expr
 		collationName := charset.DefaultCollation().Name()
 		return sysVar.Scope.SetValue(ctx, "collation_connection", collationName)
 	case "collation_connection":
-		// Convert numeric collation ID to name (from MariaDB binlogs)
 		val, err = sql.ConvertCollationID(val)
 		if err != nil {
 			return err
@@ -464,7 +462,6 @@ func setSystemVar(ctx *sql.Context, sysVar *expression.SystemVar, right sql.Expr
 		collationName := charset.DefaultCollation().Name()
 		return sysVar.Scope.SetValue(ctx, "collation_server", collationName)
 	case "collation_server":
-		// Convert numeric collation ID to name (from MariaDB binlogs)
 		val, err = sql.ConvertCollationID(val)
 		if err != nil {
 			return err
@@ -488,7 +485,6 @@ func setSystemVar(ctx *sql.Context, sysVar *expression.SystemVar, right sql.Expr
 		charsetName := collation.CharacterSet().Name()
 		return sysVar.Scope.SetValue(ctx, "character_set_server", charsetName)
 	case "collation_database":
-		// Convert numeric collation ID to name (from MariaDB binlogs)
 		val, err = sql.ConvertCollationID(val)
 		if err != nil {
 			return err
@@ -501,9 +497,8 @@ func setSystemVar(ctx *sql.Context, sysVar *expression.SystemVar, right sql.Expr
 			val = fmt.Sprintf("%v", val)
 		}
 		return sysVar.Scope.SetValue(ctx, sysVar.Name, val)
-	default:
-		return sysVar.Scope.SetValue(ctx, sysVar.Name, val)
 	}
+	return nil
 }
 
 func validateSystemVariableValue(sysVarName string, val interface{}) error {