Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ export CGO_CFLAGS := -O1

# regenerate rice-box.go when any of the .cnf files change
embed_config:
cd go/vt/mysqlctl && go run github.com/GeertJohan/go.rice/rice embed-go
cd go/vt/mysqlctl && go build .
cd go/vt/mysqlctl && go run github.com/GeertJohan/go.rice/rice embed-go && go build .

# build the vitess binaries with dynamic dependency on libc
build-dyn:
Expand Down
42 changes: 0 additions & 42 deletions config/mycnf/mysql56.cnf

This file was deleted.

3 changes: 0 additions & 3 deletions config/mycnf/mysql57.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ relay_log_info_repository = TABLE
relay_log_purge = 1
relay_log_recovery = 1

# we should never need super privileges
super-read-only

# In MySQL 5.7 the default charset is latin1

character_set_server = utf8
Expand Down
3 changes: 0 additions & 3 deletions config/mycnf/mysql80.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ binlog_expire_logs_seconds = 259200
# disable mysqlx
mysqlx = 0

# we should never need super privileges
super-read-only

# 8.0 changes the default auth-plugin to caching_sha2_password
default_authentication_plugin = mysql_native_password

Expand Down
Loading