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

server: make long-data type no longer check nullBitmap #7573

Merged
merged 6 commits into from
Sep 5, 2018
Merged

server: make long-data type no longer check nullBitmap #7573

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d99bf5
server: make long data type no longer check nullBitMap
lysu Aug 31, 2018
d362b4a
trigger CI run
lysu Sep 3, 2018
e6f1a29
Merge branch 'master' into fix-mariadb-c-api-insert
lysu Sep 3, 2018
1b8174b
address comment
lysu Sep 4, 2018
882ad1c
Merge branch 'master' into fix-mariadb-c-api-insert
shenli Sep 5, 2018
e1a9502
Merge branch 'master' into fix-mariadb-c-api-insert
lysu Sep 5, 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
16 changes: 12 additions & 4 deletions server/conn_stmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,15 +246,23 @@ func parseStmtArgs(args []interface{}, boundParams [][]byte, nullBitmap, paramTy
var isNull bool

for i := 0; i < len(args); i++ {
if nullBitmap[i>>3]&(1<<(uint(i)%8)) > 0 {
args[i] = nil
continue
}
// if params had received via ComStmtSendLongData, use them directly.
// ref https://dev.mysql.com/doc/internals/en/com-stmt-send-long-data.html
// see clientConn#handleStmtSendLongData
if boundParams[i] != nil {
args[i] = boundParams[i]
continue
}

// check nullBitMap to determine the NULL arguments.
// ref https://dev.mysql.com/doc/internals/en/com-stmt-execute.html
// notice: some client(e.g. mariadb) will set nullBitMap even if data had be sent via ComStmtSendLongData,
// so this check need place after boundParam's check.
if nullBitmap[i>>3]&(1<<(uint(i)%8)) > 0 {
args[i] = nil
continue
}

if (i<<1)+1 >= len(paramTypes) {
return mysql.ErrMalformPacket
}
Expand Down