aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2022-03-09 22:26:55 -0800
committerchrislu <chris.lu@gmail.com>2022-03-09 22:26:55 -0800
commit197ade6aebeea1316a757156cb7d6249bd102bd9 (patch)
tree3ee01b03c5a38766de027aae70ddbc390862df0d
parent011a41b561ed3c8c496aead94f17c8f55d25429d (diff)
parent9b9ab6da86113fb2bbf29d8dded774946503919a (diff)
downloadseaweedfs-197ade6aebeea1316a757156cb7d6249bd102bd9.tar.xz
seaweedfs-197ade6aebeea1316a757156cb7d6249bd102bd9.zip
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
-rw-r--r--weed/filer/mysql2/mysql2_store.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/weed/filer/mysql2/mysql2_store.go b/weed/filer/mysql2/mysql2_store.go
index a1f54455a..e50480150 100644
--- a/weed/filer/mysql2/mysql2_store.go
+++ b/weed/filer/mysql2/mysql2_store.go
@@ -4,6 +4,7 @@ import (
"context"
"database/sql"
"fmt"
+ "strings"
"time"
"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)
}
- 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)
}