Browse Source

Merge branch 'master' of https://github.com/chrislusf/seaweedfs

pull/2744/head
chrislu 3 years ago
parent
commit
197ade6aeb
  1. 3
      weed/filer/mysql2/mysql2_store.go

3
weed/filer/mysql2/mysql2_store.go

@ -4,6 +4,7 @@ import (
"context" "context"
"database/sql" "database/sql"
"fmt" "fmt"
"strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/filer" "github.com/chrislusf/seaweedfs/weed/filer"
@ -82,7 +83,7 @@ func (store *MysqlStore2) initialize(createTable, upsertQuery string, enableUpse
return fmt.Errorf("connect to %s error:%v", sqlUrl, err) return fmt.Errorf("connect to %s error:%v", sqlUrl, err)
} }
if err = store.CreateTable(context.Background(), abstract_sql.DEFAULT_TABLE); err != nil {
if err = store.CreateTable(context.Background(), abstract_sql.DEFAULT_TABLE); err != nil && !strings.Contains(err.Error(), "table already exist") {
return fmt.Errorf("init table %s: %v", abstract_sql.DEFAULT_TABLE, err) return fmt.Errorf("init table %s: %v", abstract_sql.DEFAULT_TABLE, err)
} }

Loading…
Cancel
Save