Skip to content

build: fix broken build for other flavors#4492

Merged
dkhenry merged 1 commit intovitessio:masterfrom
planetscale:ss-docker-fix
Jan 1, 2019
Merged

build: fix broken build for other flavors#4492
dkhenry merged 1 commit intovitessio:masterfrom
planetscale:ss-docker-fix

Conversation

@sougou
Copy link
Copy Markdown
Contributor

@sougou sougou commented Dec 31, 2018

There were a few regressions that got introduced due to
recent changes:

  • MYSQL_FLAVOR got dropped from Dockerfile.mariadb.
  • New build.env did not get included in the docker builds.
  • CapabilityClientDeprecateEOF behaves differently for MySQL 5.7
    vs older versions: MySQL 5.6 and MariaDB. For 5.7, the capability
    always comes back true, but it comes back as true or false
    for other versions. So, I just removed the check.

Also removed column length check in one of the tests because
they are not consistent across flavors.

Signed-off-by: Sugu Sougoumarane ssougou@gmail.com

There were a few regressions that got introduced due to
recent changes:
* MYSQL_FLAVOR got dropped from Dockerfile.mariadb.
* New build.env did not get included in the docker builds.
* CapabilityClientDeprecateEOF behaves differently for MySQL 5.7
  vs older versions: MySQL 5.6 and MariaDB. For 5.7, the capability
  always comes back true, but it comes back as true or false
  for other versions. So, I just removed the check.

Also removed column length check in one of the tests because
they are not consistent across flavors.

Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
@sougou
Copy link
Copy Markdown
Contributor Author

sougou commented Dec 31, 2018

@jvaidya @demmer @dkhenry

Copy link
Copy Markdown
Contributor

@dkhenry dkhenry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@dkhenry dkhenry merged commit f22c9fc into vitessio:master Jan 1, 2019
@sougou sougou deleted the ss-docker-fix branch February 3, 2019 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants