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.

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

tidb_query: fix converting bytes to bool (#7486) #7547

Merged
merged 6 commits into from
Apr 28, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 20, 2020

cherry-pick #7486 to release-3.1


Signed-off-by: zhongzc zhongzc_arch@outlook.com

What problem does this PR solve?

Fix compatibility with MySQL.
See: pingcap/tidb#16014

What is changed and how it works?

Bytes is converted to an f64 type instead of an int type to determine the bool value.

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 20, 2020

/run-all-tests

@Reminiscent
Copy link

@zhongzc Please help to fix the conflicts. Thanks!

Signed-off-by: zhongzc <zhongzc_arch@outlook.com>
Signed-off-by: zhongzc <zhongzc_arch@outlook.com>
@zhongzc
Copy link
Contributor

zhongzc commented Apr 26, 2020

/run-all-tests

@zhongzc
Copy link
Contributor

zhongzc commented Apr 26, 2020

/run-test

@zhongzc
Copy link
Contributor

zhongzc commented Apr 26, 2020

/test

Signed-off-by: zhongzc <zhongzc_arch@outlook.com>
@youjiali1995
Copy link
Contributor

/merge

@sre-bot sre-bot added the status/can-merge Status: Can merge to base branch label Apr 28, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 28, 2020

/run-all-tests

Signed-off-by: zhongzc <zhongzc_arch@outlook.com>
@zhongzc
Copy link
Contributor

zhongzc commented Apr 28, 2020

@youjiali1995 Conflict fixed.

Signed-off-by: zhongzc <zhongzc_arch@outlook.com>
@youjiali1995
Copy link
Contributor

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 28, 2020

/run-all-tests

@sre-bot sre-bot merged commit 191cb87 into tikv:release-3.1 Apr 28, 2020
solotzg added a commit to pingcap/tidb-engine-ext that referenced this pull request May 14, 2020
txn: only wake up waiters when locks are indeed released (tikv#7379) (tikv#7585)

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>

txn: don't protect rollback for BatchRollback (tikv#7605) (tikv#7608)

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>

tidb_query: add is true/false keep null ScalarFuncSig (tikv#7532) (tikv#7566)

Signed-off-by: zhongzc <zhongzc_arch@outlook.com>

tidb_query: fix the logical behavior of floats (tikv#7342) (tikv#7582)

Signed-off-by: zhongzc <zhongzc_arch@outlook.com>

tidb_query: fix converting bytes to bool (tikv#7486) (tikv#7547)

Signed-off-by: zhongzc <zhongzc_arch@outlook.com>

raftstore: change the condition of proposing rollback merge (tikv#6584) (tikv#7762)

Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
Signed-off-by: Tong Zhigao <tongzhigao@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/coprocessor SIG: Coprocessor status/can-merge Status: Can merge to base branch type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants