зеркало из https://github.com/github/vitess-gh.git
Merge pull request #4836 from SataQiu/fix-20190424
Fix some spelling mistakes
This commit is contained in:
Коммит
7a08ada1f7
|
@ -839,7 +839,7 @@ Field describes a single column returned by a query
|
|||
| <code>org_name</code> <br>string| |
|
||||
| <code>column_length</code> <br>uint32| column_length is really a uint32. All 32 bits can be used. |
|
||||
| <code>charset</code> <br>uint32| charset is actually a uint16. Only the lower 16 bits are used. |
|
||||
| <code>decimals</code> <br>uint32| decimals is actualy a uint8. Only the lower 8 bits are used. |
|
||||
| <code>decimals</code> <br>uint32| decimals is actually a uint8. Only the lower 8 bits are used. |
|
||||
| <code>flags</code> <br>uint32| flags is actually a uint16. Only the lower 16 bits are used. |
|
||||
|
||||
### query.QueryResult
|
||||
|
|
|
@ -20,7 +20,7 @@ host=$(minikube service vtgate-zone1 --format "{{.IP}}" | tail -n 1)
|
|||
port=$(minikube service vtgate-zone1 --format "{{.Port}}" | tail -n 1)
|
||||
|
||||
if [ -z $port ]; then
|
||||
#This checks K8s runing on an single node by kubeadm
|
||||
#This checks K8s running on an single node by kubeadm
|
||||
if [ $(kubectl get nodes | grep -v NAM | wc -l) -eq 1 -o $(kubectl get nodes | grep -v NAM | grep master | wc -l ) -eq 1 ]; then
|
||||
host="127.0.0.1"
|
||||
port=`kubectl describe service vtgate-zone1 | grep NodePort | grep mysql | awk '{print $3}' | awk -F'/' '{print $1}'`
|
||||
|
|
|
@ -106,7 +106,7 @@ func main() {
|
|||
fmt.Printf("SUCCESS: ClusterOperation finished.\n\nDetails:\n%v", proto.MarshalTextString(resp))
|
||||
}
|
||||
|
||||
// waitForClusterOp polls and blocks until the ClusterOperation invocation specified by "id" has finished. If an error occured, it will be returned.
|
||||
// waitForClusterOp polls and blocks until the ClusterOperation invocation specified by "id" has finished. If an error occurred, it will be returned.
|
||||
func waitForClusterOp(client automationservicepb.AutomationClient, id string) (*automationpb.GetClusterOperationDetailsResponse, error) {
|
||||
for {
|
||||
req := &automationpb.GetClusterOperationDetailsRequest{
|
||||
|
|
|
@ -197,11 +197,11 @@ type command struct {
|
|||
|
||||
var commands = []command{
|
||||
{"init", initCmd, "[-wait_time=5m] [-init_db_sql_file=]",
|
||||
"Initalizes the directory structure and starts mysqld"},
|
||||
"Initializes the directory structure and starts mysqld"},
|
||||
{"init_config", initConfigCmd, "",
|
||||
"Initalizes the directory structure, creates my.cnf file, but does not start mysqld"},
|
||||
"Initializes the directory structure, creates my.cnf file, but does not start mysqld"},
|
||||
{"reinit_config", reinitConfigCmd, "",
|
||||
"Reinitalizes my.cnf file with new server_id"},
|
||||
"Reinitializes my.cnf file with new server_id"},
|
||||
{"teardown", teardownCmd, "[-wait_time=5m] [-force]",
|
||||
"Shuts mysqld down, and removes the directory"},
|
||||
{"start", startCmd, "[-wait_time=5m]",
|
||||
|
|
|
@ -33,7 +33,7 @@ import (
|
|||
|
||||
var (
|
||||
schemaChangeDir = flag.String("schema_change_dir", "", "directory contains schema changes for all keyspaces. Each keyspace has its own directory and schema changes are expected to live in '$KEYSPACE/input' dir. e.g. test_keyspace/input/*sql, each sql file represents a schema change")
|
||||
schemaChangeController = flag.String("schema_change_controller", "", "schema change controller is responsible for finding schema changes and responsing schema change events")
|
||||
schemaChangeController = flag.String("schema_change_controller", "", "schema change controller is responsible for finding schema changes and responding to schema change events")
|
||||
schemaChangeCheckInterval = flag.Int("schema_change_check_interval", 60, "this value decides how often we check schema change dir, in seconds")
|
||||
schemaChangeUser = flag.String("schema_change_user", "", "The user who submits this schema change.")
|
||||
schemaChangeSlaveTimeout = flag.Duration("schema_change_slave_timeout", 10*time.Second, "how long to wait for slaves to receive the schema change")
|
||||
|
|
|
@ -64,7 +64,7 @@ func usage() {
|
|||
for _, name := range vtexplainFlags {
|
||||
f := flag.Lookup(name)
|
||||
if f == nil {
|
||||
panic("unkown flag " + name)
|
||||
panic("unknown flag " + name)
|
||||
}
|
||||
flagUsage(f)
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче