From 8bd63a4d12c209b63d4dd86a7425602b56417d5f Mon Sep 17 00:00:00 2001
From: shenli <shenli3514@gmail.com>
Date: Mon, 7 Sep 2015 12:02:21 +0800
Subject: [PATCH 1/2] parser: Change syntax error log

Make syntax log easy to read.

https://github.com/pingcap/tidb/issues/25
---
 parser/scanner.l | 2 +-
 session.go       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/parser/scanner.l b/parser/scanner.l
index 7cce1c1354075..d63e47efdb1d1 100644
--- a/parser/scanner.l
+++ b/parser/scanner.l
@@ -118,7 +118,7 @@ func (l *lexer) next() int {
 }
 
 func (l *lexer) err0(ln, c int, s string, args ...interface{}) {
-	err := errors.Errorf(fmt.Sprintf("%d:%d ", ln, c)+s, args...)
+	err := errors.Errorf(fmt.Sprintf("line %d column %d near \"%s\"", ln, c, l.val), args...)
 	l.errs = append(l.errs, err)
 }
 
diff --git a/session.go b/session.go
index 0b7b6847ea933..c58fef47fb337 100644
--- a/session.go
+++ b/session.go
@@ -120,7 +120,8 @@ func (s *session) String() string {
 func (s *session) Execute(sql string) ([]rset.Recordset, error) {
 	stmts, err := Compile(sql)
 	if err != nil {
-		log.Errorf("Compile sql error: %s - %s", sql, err)
+		log.Errorf("Syntax error: %s", sql)
+		log.Errorf("Error occurs at %s.", err)
 		return nil, errors.Trace(err)
 	}
 

From e84fca597969a5a840705ee8d0fcf8c331bd8074 Mon Sep 17 00:00:00 2001
From: shenli <shenli3514@gmail.com>
Date: Mon, 7 Sep 2015 17:36:32 +0800
Subject: [PATCH 2/2] parser: Change err0

Address comment
---
 parser/scanner.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parser/scanner.l b/parser/scanner.l
index d63e47efdb1d1..1bf4a4c8fa574 100644
--- a/parser/scanner.l
+++ b/parser/scanner.l
@@ -117,13 +117,13 @@ func (l *lexer) next() int {
 	return l.c
 }
 
-func (l *lexer) err0(ln, c int, s string, args ...interface{}) {
+func (l *lexer) err0(ln, c int, args ...interface{}) {
 	err := errors.Errorf(fmt.Sprintf("line %d column %d near \"%s\"", ln, c, l.val), args...)
 	l.errs = append(l.errs, err)
 }
 
 func (l *lexer) err(s string, args ...interface{}) {
-	l.err0(l.line, l.col, s, args...)
+	l.err0(l.line, l.col, args...)
 }
 
 func (l *lexer) Error(s string) {