Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

session: move more session vars to stmt context for retrying #8034

Merged
merged 20 commits into from
Dec 10, 2018
Merged

session: move more session vars to stmt context for retrying #8034

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f5d4953
reset context of statement when retry
jackysp Oct 24, 2018
36aafb3
add a test case
jackysp Oct 24, 2018
7ec3fb2
fix the test
jackysp Oct 24, 2018
8bda6f1
remove debug log
jackysp Oct 24, 2018
14fd55c
remove ResetForRetry
jackysp Oct 29, 2018
bf6b353
Merge branch 'master' into reset_ctx
lysu Nov 7, 2018
4c80ade
refactor to the old method
jackysp Nov 8, 2018
95ec37b
reset affected rows
jackysp Nov 8, 2018
f331d3d
Merge branch 'master' into reset_ctx
jackysp Nov 8, 2018
302934b
remove useless function
jackysp Nov 8, 2018
944102b
keep prepared params in session ctx
jackysp Nov 8, 2018
12dfe73
reset more
jackysp Nov 8, 2018
225d103
Merge branch 'master' into reset_ctx
jackysp Nov 8, 2018
2f6efab
move last insert id to statement context
jackysp Nov 9, 2018
7f76ec6
fix ci
jackysp Nov 16, 2018
39d95cf
move the LastInsertID and InsertID into StmtCtx
jackysp Nov 16, 2018
ac6f703
Merge branch 'master' into reset_ctx
jackysp Nov 16, 2018
b54fa66
Merge branch 'master' into reset_ctx
jackysp Dec 7, 2018
ff9ff0c
fix CI
jackysp Dec 7, 2018
ea764d2
Merge branch 'master' into reset_ctx
jackysp Dec 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove debug log
  • Loading branch information
@jackysp
jackysp committed Oct 24, 2018
commit 8bda6f1b4b20c6474aea3b8ed12fcfcfcda85a27
2 changes: 0 additions & 2 deletions expression/builtin_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"github.com/pingcap/tidb/util/chunk"
"github.com/pingcap/tidb/util/printer"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)

var (
Expand Down Expand Up @@ -439,6 +438,5 @@ func (b *builtinRowCountSig) Clone() builtinFunc {
// See https://dev.mysql.com/doc/refman/5.7/en/information-functions.html#function_row-count.
func (b *builtinRowCountSig) evalInt(_ chunk.Row) (res int64, isNull bool, err error) {
res = int64(b.ctx.GetSessionVars().PrevAffectedRows)
logrus.Infof("YUSP %d", res)
return res, false, nil
}