Skip to content

Commit

Permalink
merge master0307 (vitessio#207)
Browse files Browse the repository at this point in the history
* Merge branch 'master' into split-table-merge-master0306

* 修复agent容器无法跨容器恢复MySQL数据的问题

* fix test cases

* fix ci test

* Bugfix: GROUP BY/HAVING alias resolution (vitessio#15344) (vitessio#15381

* add params for proxy support ddl operations

* merge origin

* fix client_found_row (vitessio#203)

* merge origin to a2c986c

* fix client found rows

* Use GetTabletsByCell in healthcheck

* delete start params:track_schema_versions.

* auto delete logs from three days ago

* 解决跨cell获取节点失败和SQL权限没有正确拦截的问题

* merge origin 3a35dd

* 支持MySQL8.0编译... (vitessio#185)

* 修改show vitess_shards|vitess_tables和 show variables (vitessio#175)

* fix binaryhash

* fix: container restart ,programs restart failed

* add start params

* merge origin with laster pr:f39ada

* fix vttablet startup

* fix openEuler dockerfile

* merge origin bugfix

* fix master ci

* Bugfix: fix pinned table for splitclone (vitessio#141)
  • Loading branch information
wangwei1207 authored and lingxiao committed Mar 7, 2024
1 parent 0221e5f commit 1ad4983
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile-centos-amd64
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ MAINTAINER StarDB <[email protected]>
ARG MYSQL_VERSION

# Set up Vitess user and directory tree.
RUN groupadd --system --gid 1001 mysql && useradd --system --uid 1001 --gid 1001 mysql
RUN groupadd -r vitess && useradd -r -g vitess vitess
RUN groupadd -r mysql && useradd -r -g mysql mysql
RUN mkdir -p /vt/vtdataroot && chown -R vitess:vitess /vt

# Set up Vitess environment (just enough to run pre-built Go binaries)
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-openeuler-amd64
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ MAINTAINER StarDB <[email protected]>
ARG MYSQL_VERSION

# Set up Vitess user and directory tree.
RUN groupadd --system --gid 1001 mysql && useradd --system --uid 1001 --gid 1001 mysql
RUN groupadd -r vitess && useradd -r -g vitess vitess
RUN groupadd -r mysql && useradd -r -g mysql mysql
RUN mkdir -p /vt/vtdataroot && chown -R vitess:vitess /vt

# Set up Vitess environment (just enough to run pre-built Go binaries)
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-openeuler-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ ARG MYSQL_VERSION
RUN yum install -y shadow-utils

# Set up Vitess user and directory tree.
RUN groupadd --system --gid 1001 mysql && useradd --system --uid 1001 --gid 1001 mysql
RUN groupadd -r vitess && useradd -r -g vitess vitess
RUN groupadd -r mysql && useradd -r -g mysql mysql
RUN mkdir -p /vt/vtdataroot && chown -R vitess:vitess /vt

# Set up Vitess environment (just enough to run pre-built Go binaries)
Expand Down

0 comments on commit 1ad4983

Please sign in to comment.