File tree Expand file tree Collapse file tree 2 files changed +20
-1
lines changed Expand file tree Collapse file tree 2 files changed +20
-1
lines changed Original file line number Diff line number Diff line change 49
49
fast_finish : true
50
50
allow_failures :
51
51
- env : srv=build v=10.6
52
+ - env : srv=xpand
52
53
include :
53
54
- env : srv=mariadb v=10.2 local=1
54
55
- env : srv=mariadb v=10.3 local=1
75
76
env : srv=mysql v=5.7
76
77
- if : type = push AND fork = false
77
78
env : srv=mysql v=8.0
79
+ - if : type = push AND fork = false
80
+ env : srv=xpand
78
81
79
82
notifications :
80
83
email : false
Original file line number Diff line number Diff line change @@ -16,6 +16,15 @@ def is_skysql():
16
16
def is_maxscale ():
17
17
return os .environ .get ('srv' ) == "maxscale" or os .environ .get ('srv' ) == 'skysql-ha'
18
18
19
+
20
+ def is_xpand ():
21
+ if os .environ .get ('srv' ) == "xpand" :
22
+ return True
23
+ conn = create_connection ()
24
+ version = conn .get_server_version ()
25
+ del conn
26
+ return "Xpand" in version
27
+
19
28
def is_mysql ():
20
29
mysql_server = 1
21
30
conn = create_connection ()
@@ -34,4 +43,11 @@ def create_connection(additional_conf=None):
34
43
else :
35
44
c = {key : value for (key , value ) in (list (default_conf .items ()) + list (
36
45
additional_conf .items ()))}
37
- return mariadb .connect (** c )
46
+ conn = mariadb .connect (** c )
47
+ version = conn .get_server_version ()
48
+ # https://jira.mariadb.org/browse/XPT-266
49
+ if "Xpand" in version or os .environ .get ('srv' ) == "xpand" :
50
+ cursor = conn .cursor ()
51
+ cursor .execute ("SET NAMES UTF8" )
52
+ del cursor
53
+ return conn
You can’t perform that action at this time.
0 commit comments