/cockroach

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

release-2.1: mysql import polish fixes #31305

Merged
merged 3 commits into from Oct 12, 2018

Conversation

Reviewers

@mjibson mjibson

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@dt @cockroach-teamcity @mjibson
@dt
Member

dt commented Oct 12, 2018

Backport:

  • 1/1 commits from "importccl: ignore mysql's _binary introducer" (#31188)
  • 1/1 commits from "importccl: add explicit default to mysql testdata timestamp" (#31217)
  • 1/1 commits from "importccl: parse zero mysql dates as null" (#31288)

Please see individual PRs for details.

/cc @cockroachdb/release

dt added some commits Oct 10, 2018

@dt
importccl: ignore mysql's _binary introducer 
MySQL version 5.7.23 included a change to mysqldump, compared to .22, to prefix binary fields with the '_binary' introducer.
These are described in the mysql docs here: https://dev.mysql.com/doc/refman/5.7/en/charset-introducer.html

Fixes #31169.

Release note (sql change): handle binary fields dumped by muysqldump v5.7.23 with _binary prefix.
Verified
This commit was signed with a verified signature.
@dt dt David Taylor
GPG key ID: 01D8438FDFAE4E9A Learn about signing commits
f04c6b7
@dt
importccl: add explicit default to mysql testdata timestamp 
this makes the testdata work on mysql 8.0.2+, where the timestamp type no longer has the implicit defaults.

Release note: none.
Verified
This commit was signed with a verified signature.
@dt dt David Taylor
GPG key ID: 01D8438FDFAE4E9A Learn about signing commits
9e5eb46
@dt
importccl: parse zero mysql dates as null 
these nonsense values are permitted by older / less strict mysql
versions but have no cockroach counterpart -- a date is either null, or
an actual date, which cannot have a zero day or month. Mapping these
values to null is the closest we can get them, and in schemas that allow
null values, hopefully makes migration easier. In schemas that do not
allow nulls these will of course produce errors but we do not really
have another option in those cases.

Fixes #29298.

Release note: none.
Verified
This commit was signed with a verified signature.
@dt dt David Taylor
GPG key ID: 01D8438FDFAE4E9A Learn about signing commits
Loading status checks…
73c2e31

@dt dt requested a review from mjibson Oct 12, 2018

@dt dt requested a review from cockroachdb/sql-bulk-prs as a code owner Oct 12, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 12, 2018

Member

This change is Reviewable
Member

cockroach-teamcity commented Oct 12, 2018

This change is Reviewable

@dt dt changed the title from release-2.1: TODO to release-2.1: mysql import polish fixes Oct 12, 2018

@dt dt merged commit 8c5fd36 into cockroachdb:release-2.1 Oct 12, 2018
2 checks passed

2 checks passed

GitHub CI (Cockroach) TeamCity build finished
Details
license/cla Contributor License Agreement is signed.
Details

@dt dt deleted the dt:backport2.1-31188-31217-31288 branch Oct 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment