Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dex
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hdacloud
dex
Commits
d2c33db8
Commit
d2c33db8
authored
5 years ago
by
Nandor Kracser
Browse files
Options
Downloads
Patches
Plain Diff
storage/mysql: support pre-5.7.20 instances with tx_isolation only
parent
8427f0f1
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
storage/sql/config.go
+21
-0
21 additions, 0 deletions
storage/sql/config.go
with
21 additions
and
0 deletions
storage/sql/config.go
+
21
−
0
View file @
d2c33db8
...
@@ -29,6 +29,7 @@ const (
...
@@ -29,6 +29,7 @@ const (
// MySQL error codes
// MySQL error codes
mysqlErrDupEntry
=
1062
mysqlErrDupEntry
=
1062
mysqlErrDupEntryWithKeyName
=
1586
mysqlErrDupEntryWithKeyName
=
1586
mysqlErrUnknownSysVar
=
1193
)
)
// SQLite3 options for creating an SQL db.
// SQLite3 options for creating an SQL db.
...
@@ -307,6 +308,26 @@ func (s *MySQL) open(logger log.Logger) (*conn, error) {
...
@@ -307,6 +308,26 @@ func (s *MySQL) open(logger log.Logger) (*conn, error) {
return
nil
,
err
return
nil
,
err
}
}
err
=
db
.
Ping
()
if
err
!=
nil
{
if
mysqlErr
,
ok
:=
err
.
(
*
mysql
.
MySQLError
);
ok
&&
mysqlErr
.
Number
==
mysqlErrUnknownSysVar
{
logger
.
Info
(
"reconnecting with MySQL pre-5.7.20 compatibilty mode"
)
// MySQL 5.7.20 introduced transaction_isolation and deprecated tx_isolation.
// MySQL 8.0 doesn't have tx_isolation at all.
// https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_transaction_isolation
delete
(
cfg
.
Params
,
"transaction_isolation"
)
cfg
.
Params
[
"tx_isolation"
]
=
"'SERIALIZABLE'"
db
,
err
=
sql
.
Open
(
"mysql"
,
cfg
.
FormatDSN
())
if
err
!=
nil
{
return
nil
,
err
}
}
else
{
return
nil
,
err
}
}
errCheck
:=
func
(
err
error
)
bool
{
errCheck
:=
func
(
err
error
)
bool
{
sqlErr
,
ok
:=
err
.
(
*
mysql
.
MySQLError
)
sqlErr
,
ok
:=
err
.
(
*
mysql
.
MySQLError
)
if
!
ok
{
if
!
ok
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment