fix echo variable (#117)

pingcap · Dec 7, 2023 · c5cf84a · c5cf84a
1 parent 17b728e
commit c5cf84a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/generate_perror/main.go b/generate_perror/main.go
@@ -20,6 +20,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"regexp"
 	"sort"
 	"strconv"

diff --git a/r/example.result b/r/example.result
@@ -45,4 +45,5 @@ info:
 INSERT t1 VALUES (1, 1), (1, 1) ON DUPLICATE KEY UPDATE f1 = 2, f2 = 2;
 affected rows: 3
 info: Records: 2  Duplicates: 1  Warnings: 0
+1
 use `test`;;
diff --git a/src/main.go b/src/main.go
@@ -390,7 +390,7 @@ func (t *tester) Run() error {
 		case Q_ERROR:
 			t.expectedErrs = strings.Split(strings.TrimSpace(s), ",")
 		case Q_ECHO:
-			varSearch := regexp.MustCompile(`\\$([A-Za-z0-9_]+)( |$)`)
+			varSearch := regexp.MustCompile(`\$([A-Za-z0-9_]+)( |$)`)
 			s := varSearch.ReplaceAllStringFunc(s, func(s string) string {
 				return os.Getenv(varSearch.FindStringSubmatch(s)[1])
 			})

diff --git a/t/example.test b/t/example.test
@@ -44,4 +44,7 @@ INSERT t1 VALUES (1, 1);
 INSERT t1 VALUES (1, 1), (1, 1) ON DUPLICATE KEY UPDATE f1 = 2, f2 = 2;
 --disable_info
 
+--let $a=`select 1`
+--echo $a
+
 use `test`;;