diff --git a/mariadb/.my-healthcheck.cnf b/mariadb/.my-healthcheck.cnf
new file mode 100644
index 000000000..d44489cc5
--- /dev/null
+++ b/mariadb/.my-healthcheck.cnf
@@ -0,0 +1,7 @@
+[mariadb-client]
+port=3306
+socket=/run/mysqld/mysqld.sock
+user=healthcheck
+password=S9(`YjVPX"aEq4_x<`j}CI-fQMuSud*[
+protocol=tcp
+
diff --git a/mariadb/aria_log.00000001 b/mariadb/aria_log.00000001
new file mode 100644
index 000000000..65e8b17dc
Binary files /dev/null and b/mariadb/aria_log.00000001 differ
diff --git a/mariadb/aria_log_control b/mariadb/aria_log_control
new file mode 100644
index 000000000..385d521c6
Binary files /dev/null and b/mariadb/aria_log_control differ
diff --git a/mariadb/ddl_recovery.log b/mariadb/ddl_recovery.log
new file mode 100644
index 000000000..5e30b6d29
Binary files /dev/null and b/mariadb/ddl_recovery.log differ
diff --git a/mariadb/ib_buffer_pool b/mariadb/ib_buffer_pool
new file mode 100644
index 000000000..2f5813ee2
--- /dev/null
+++ b/mariadb/ib_buffer_pool
@@ -0,0 +1,2016 @@
+263,6
+263,5
+263,4
+263,3
+263,2
+263,1
+263,0
+262,7
+262,6
+262,5
+262,4
+262,3
+262,2
+262,1
+262,0
+261,7
+261,6
+261,5
+261,4
+261,3
+261,2
+261,1
+261,0
+260,8
+260,7
+260,6
+260,5
+260,4
+260,3
+260,2
+260,1
+260,0
+259,5
+259,4
+259,3
+259,2
+259,1
+259,0
+258,4
+258,3
+258,2
+258,1
+258,0
+5,79
+257,6
+257,5
+257,4
+257,3
+257,2
+257,1
+257,0
+256,6
+256,5
+256,4
+256,3
+256,2
+256,1
+256,0
+255,5
+255,4
+255,3
+255,2
+255,1
+255,0
+254,6
+254,5
+254,4
+254,3
+254,2
+254,1
+254,0
+5,78
+253,6
+253,5
+253,4
+253,3
+253,2
+253,1
+253,0
+252,6
+252,5
+252,4
+252,3
+252,2
+252,1
+252,0
+251,5
+251,4
+251,3
+251,2
+251,1
+251,0
+250,6
+250,5
+250,4
+250,3
+250,2
+250,1
+250,0
+249,10
+249,9
+249,8
+249,7
+249,6
+249,5
+249,4
+249,3
+249,2
+249,1
+249,0
+0,202
+5,77
+248,6
+248,5
+248,4
+248,3
+248,2
+248,1
+248,0
+247,6
+247,5
+247,4
+247,3
+247,2
+247,1
+247,0
+0,201
+246,6
+246,5
+246,4
+246,3
+246,2
+0,200
+246,1
+246,0
+245,6
+245,5
+245,4
+245,3
+245,2
+245,1
+245,0
+244,4
+244,3
+244,2
+244,1
+244,0
+5,76
+243,6
+243,5
+243,4
+243,3
+243,2
+243,1
+243,0
+242,5
+242,4
+242,3
+242,2
+242,1
+242,0
+241,6
+241,5
+241,4
+241,3
+241,2
+241,1
+241,0
+240,4
+240,3
+240,2
+240,1
+240,0
+239,6
+239,5
+239,4
+239,3
+239,2
+239,1
+239,0
+0,199
+238,5
+0,198
+238,4
+238,3
+238,2
+238,1
+238,0
+237,5
+237,4
+237,3
+237,2
+237,1
+237,0
+236,3
+236,2
+236,1
+236,0
+235,5
+235,4
+235,3
+235,2
+235,1
+235,0
+234,3
+234,2
+234,1
+234,0
+233,4
+233,3
+233,2
+233,1
+233,0
+232,202
+232,201
+232,200
+232,199
+232,198
+232,197
+232,196
+232,195
+232,194
+232,193
+232,192
+232,191
+232,190
+232,189
+232,188
+232,187
+232,186
+232,185
+232,184
+232,183
+232,182
+232,181
+232,180
+232,179
+232,178
+232,177
+232,176
+232,175
+232,174
+232,173
+232,172
+232,171
+232,170
+232,169
+232,168
+232,167
+232,166
+232,165
+232,164
+232,163
+232,162
+232,161
+232,160
+232,159
+232,158
+232,157
+232,156
+232,155
+232,47
+232,154
+232,153
+232,152
+232,151
+232,150
+232,149
+232,46
+232,148
+232,147
+232,146
+232,145
+232,144
+232,143
+232,142
+232,141
+232,140
+232,139
+232,45
+232,138
+232,137
+232,136
+232,135
+232,134
+232,133
+232,132
+232,131
+232,130
+232,129
+232,128
+232,127
+232,126
+232,125
+232,124
+232,44
+232,123
+232,122
+232,121
+232,120
+232,119
+232,118
+232,117
+232,43
+232,116
+232,115
+232,114
+232,113
+232,112
+232,111
+232,110
+232,109
+232,108
+232,107
+232,106
+232,105
+232,104
+232,103
+232,102
+232,101
+232,100
+232,99
+232,98
+232,42
+232,97
+232,96
+232,95
+232,41
+232,94
+232,93
+232,92
+232,91
+232,90
+232,89
+232,88
+232,87
+232,86
+232,85
+232,84
+232,83
+232,82
+232,81
+232,80
+232,79
+232,78
+232,77
+232,76
+232,75
+232,74
+232,40
+232,73
+232,72
+232,71
+232,70
+232,69
+232,68
+232,67
+232,66
+232,65
+232,39
+232,64
+232,38
+232,37
+232,36
+232,35
+232,34
+232,33
+232,32
+232,31
+232,30
+232,29
+232,28
+232,27
+232,26
+232,25
+232,24
+232,23
+232,22
+232,21
+232,20
+232,19
+232,18
+232,17
+232,16
+232,15
+232,14
+232,13
+232,12
+232,11
+232,10
+232,9
+232,8
+232,7
+232,6
+232,5
+232,4
+232,3
+232,2
+232,1
+232,0
+5,75
+231,9
+231,8
+231,7
+231,6
+231,5
+231,4
+231,3
+231,2
+231,1
+231,0
+230,22
+230,21
+230,20
+230,19
+230,18
+230,17
+230,16
+230,15
+230,14
+230,13
+230,12
+230,11
+230,10
+230,9
+230,8
+230,7
+230,6
+230,5
+230,4
+230,3
+230,2
+230,1
+230,0
+229,5
+229,4
+229,3
+229,2
+229,1
+229,0
+228,5
+228,4
+228,3
+228,2
+228,1
+228,0
+227,6
+227,5
+227,4
+227,3
+227,2
+227,1
+227,0
+226,5
+226,4
+226,3
+226,2
+226,1
+226,0
+225,5
+225,4
+225,3
+225,2
+225,1
+225,0
+5,74
+224,9
+224,8
+224,7
+224,6
+224,5
+224,4
+224,3
+224,2
+224,1
+224,0
+223,7
+223,6
+223,5
+223,4
+223,3
+223,2
+223,1
+223,0
+222,11
+222,10
+222,9
+222,8
+222,7
+222,6
+222,5
+222,4
+222,3
+222,2
+222,1
+222,0
+221,6
+221,5
+221,4
+221,3
+221,2
+221,1
+221,0
+220,5
+220,4
+220,3
+220,2
+220,1
+220,0
+5,73
+219,6
+219,5
+219,4
+219,3
+219,2
+219,1
+219,0
+218,6
+218,5
+218,4
+218,3
+218,2
+218,1
+218,0
+217,6
+217,5
+217,4
+217,3
+217,2
+217,1
+217,0
+216,6
+216,5
+216,4
+216,3
+216,2
+216,1
+216,0
+5,72
+215,6
+215,5
+215,4
+215,3
+215,2
+215,1
+215,0
+214,6
+214,5
+214,4
+214,3
+214,2
+214,1
+214,0
+213,5
+213,4
+213,3
+213,2
+213,1
+213,0
+212,5
+212,4
+212,3
+212,2
+212,1
+212,0
+5,71
+211,5
+211,4
+211,3
+211,2
+211,1
+211,0
+0,197
+210,6
+210,5
+210,4
+210,3
+210,2
+210,1
+210,0
+209,5
+209,4
+209,3
+209,2
+209,1
+209,0
+208,5
+208,4
+208,3
+208,2
+208,1
+208,0
+207,6
+207,5
+207,4
+207,3
+207,2
+207,1
+207,0
+5,70
+206,5
+206,4
+206,3
+206,2
+206,1
+206,0
+205,6
+205,5
+205,4
+205,3
+205,2
+205,1
+205,0
+204,6
+204,5
+204,4
+204,3
+204,2
+204,1
+204,0
+203,6
+203,5
+203,4
+203,3
+203,2
+203,1
+203,0
+5,69
+202,6
+202,5
+202,4
+202,3
+202,2
+202,1
+202,0
+201,5
+201,4
+201,3
+201,2
+201,1
+201,0
+200,5
+200,4
+200,3
+200,2
+200,1
+200,0
+199,6
+199,5
+199,4
+199,3
+199,2
+199,1
+199,0
+5,68
+4,5
+4,4
+198,6
+198,5
+198,4
+198,3
+198,2
+198,1
+198,0
+197,5
+197,4
+197,3
+197,2
+197,1
+197,0
+196,6
+196,5
+196,4
+196,3
+196,2
+196,1
+196,0
+195,6
+195,5
+195,4
+195,3
+195,2
+195,1
+195,0
+5,67
+194,5
+194,4
+194,3
+194,2
+0,196
+194,1
+194,0
+193,18
+193,17
+193,16
+193,15
+193,14
+193,13
+193,12
+193,11
+193,10
+193,9
+193,8
+193,7
+193,6
+193,5
+193,4
+193,3
+193,2
+193,1
+193,0
+192,6
+192,5
+192,4
+192,3
+192,2
+192,1
+192,0
+191,5
+191,4
+191,3
+191,2
+191,1
+191,0
+190,12
+190,11
+190,10
+190,9
+190,8
+190,7
+190,6
+190,5
+190,4
+190,3
+190,2
+190,1
+190,0
+189,3
+189,2
+189,1
+189,0
+188,3
+188,2
+188,1
+188,0
+5,66
+187,6
+187,5
+187,4
+187,3
+187,2
+187,1
+187,0
+186,5
+186,4
+186,3
+186,2
+186,1
+186,0
+185,6
+185,5
+185,4
+185,3
+185,2
+185,1
+185,0
+184,6
+184,5
+184,4
+184,3
+184,2
+184,1
+184,0
+0,195
+0,194
+183,6
+183,5
+183,4
+183,3
+183,2
+183,1
+183,0
+5,65
+182,6
+182,5
+182,4
+182,3
+182,2
+182,1
+182,0
+181,6
+181,5
+181,4
+181,3
+181,2
+181,1
+181,0
+180,6
+180,5
+180,4
+180,3
+180,2
+180,1
+180,0
+179,5
+179,4
+179,3
+179,2
+179,1
+179,0
+178,5
+178,4
+178,3
+178,2
+178,1
+178,0
+5,64
+177,5
+177,4
+177,3
+177,2
+177,1
+177,0
+176,6
+176,5
+176,4
+176,3
+176,2
+176,1
+176,0
+175,5
+175,4
+175,3
+175,2
+175,1
+175,0
+174,5
+174,4
+174,3
+174,2
+174,1
+174,0
+173,6
+173,5
+173,4
+173,3
+173,2
+173,1
+173,0
+5,35
+172,5
+172,4
+172,3
+172,2
+172,1
+172,0
+171,6
+171,5
+171,4
+171,3
+171,2
+171,1
+171,0
+170,6
+170,5
+170,4
+170,3
+170,2
+170,1
+170,0
+169,6
+169,5
+169,4
+169,3
+169,2
+169,1
+169,0
+168,6
+168,5
+168,4
+168,3
+168,2
+168,1
+168,0
+5,34
+167,5
+167,4
+167,3
+167,2
+167,1
+167,0
+166,5
+166,4
+166,3
+166,2
+166,1
+166,0
+165,6
+165,5
+165,4
+165,3
+165,2
+165,1
+165,0
+164,6
+164,5
+164,4
+164,3
+164,2
+164,1
+164,0
+163,5
+163,4
+163,3
+163,2
+163,1
+163,0
+0,193
+0,192
+5,33
+162,6
+162,5
+162,4
+162,3
+162,2
+162,1
+162,0
+161,6
+161,5
+161,4
+161,3
+161,2
+161,1
+161,0
+160,5
+160,4
+160,3
+160,2
+160,1
+160,0
+159,18
+159,17
+159,16
+159,15
+159,14
+159,13
+159,12
+159,11
+159,10
+159,9
+159,8
+159,7
+159,6
+159,5
+159,4
+159,3
+159,2
+159,1
+159,0
+158,6
+158,5
+158,4
+158,3
+158,2
+158,1
+158,0
+157,44
+157,43
+157,42
+157,41
+157,40
+157,39
+157,38
+157,37
+157,36
+157,35
+157,34
+157,33
+157,32
+157,31
+157,30
+157,29
+157,28
+157,27
+157,26
+157,25
+157,24
+157,23
+157,22
+157,21
+157,20
+157,19
+157,18
+157,17
+157,16
+157,15
+157,14
+157,13
+157,12
+157,11
+157,10
+157,9
+157,8
+157,7
+157,6
+157,5
+157,4
+157,3
+157,2
+157,1
+157,0
+0,255
+156,5
+156,4
+156,3
+156,2
+156,1
+156,0
+5,32
+155,6
+155,5
+155,4
+155,3
+155,2
+155,1
+155,0
+154,8
+154,7
+154,6
+154,5
+154,4
+154,3
+154,2
+154,1
+154,0
+153,5
+153,4
+153,3
+153,2
+153,1
+153,0
+152,6
+152,5
+152,4
+152,3
+152,2
+152,1
+152,0
+5,31
+151,5
+151,4
+151,3
+151,2
+151,1
+151,0
+150,6
+150,5
+150,4
+150,3
+150,2
+150,1
+150,0
+149,6
+149,5
+149,4
+149,3
+149,2
+149,1
+149,0
+148,6
+148,5
+148,4
+148,3
+148,2
+148,1
+148,0
+147,5
+147,4
+147,3
+147,2
+147,1
+147,0
+5,30
+146,6
+146,5
+146,4
+146,3
+146,2
+146,1
+146,0
+145,9
+145,8
+145,7
+145,6
+0,63
+145,5
+145,4
+145,3
+145,2
+145,1
+145,0
+144,6
+144,5
+144,4
+144,3
+144,2
+144,1
+144,0
+143,5
+143,4
+143,3
+143,2
+143,1
+143,0
+5,29
+142,6
+142,5
+142,4
+142,3
+142,2
+142,1
+142,0
+141,6
+141,5
+141,4
+141,3
+141,2
+141,1
+141,0
+140,6
+140,5
+140,4
+140,3
+140,2
+140,1
+140,0
+139,6
+139,5
+139,4
+139,3
+139,2
+139,1
+139,0
+138,85
+138,84
+138,48
+138,83
+138,82
+138,81
+138,80
+138,47
+138,79
+138,78
+138,77
+138,76
+138,75
+138,74
+138,73
+138,46
+138,72
+138,71
+138,70
+138,69
+138,68
+138,67
+138,66
+138,65
+138,64
+138,45
+138,44
+138,43
+138,42
+138,41
+138,40
+138,39
+138,38
+138,37
+138,36
+138,35
+138,34
+138,33
+138,32
+138,31
+138,30
+138,29
+138,28
+138,27
+138,26
+138,25
+138,24
+138,23
+138,22
+138,21
+138,20
+138,19
+138,18
+138,17
+138,16
+138,15
+138,14
+138,13
+138,12
+138,11
+138,10
+138,9
+138,8
+138,7
+138,6
+138,5
+138,4
+138,3
+138,2
+138,1
+138,0
+137,87
+137,130
+137,86
+137,129
+137,85
+137,128
+137,84
+137,83
+137,82
+137,138
+137,81
+137,63
+137,80
+137,79
+137,78
+137,77
+137,62
+137,76
+137,61
+137,75
+137,60
+137,74
+137,59
+137,73
+137,58
+137,72
+137,71
+137,70
+137,69
+137,68
+137,57
+137,67
+137,66
+137,65
+137,64
+137,56
+137,55
+137,54
+137,53
+137,52
+137,51
+137,50
+137,49
+137,48
+137,47
+137,46
+137,45
+137,44
+137,43
+137,42
+137,41
+137,40
+137,39
+137,38
+137,37
+137,36
+137,35
+137,34
+137,33
+137,32
+137,31
+137,30
+137,29
+137,28
+137,27
+137,26
+137,25
+137,24
+137,23
+137,22
+137,21
+137,20
+137,19
+137,18
+137,17
+137,16
+137,15
+137,14
+137,13
+137,12
+137,11
+137,10
+137,9
+137,8
+137,7
+137,6
+137,5
+137,4
+137,3
+137,2
+137,1
+137,0
+136,28
+136,27
+136,26
+136,25
+136,24
+136,23
+136,22
+136,21
+136,20
+136,19
+136,18
+136,17
+136,16
+136,15
+136,14
+136,13
+136,12
+136,11
+136,10
+136,9
+136,8
+136,7
+136,6
+136,5
+136,4
+136,3
+136,2
+136,1
+136,0
+135,3
+135,2
+135,1
+135,0
+134,18
+134,17
+134,16
+134,15
+134,14
+134,13
+134,12
+134,11
+134,10
+134,9
+134,8
+134,7
+134,6
+134,5
+134,4
+134,3
+134,2
+134,1
+134,0
+133,194
+133,193
+133,192
+133,186
+133,185
+133,184
+133,183
+133,182
+133,181
+133,180
+133,179
+133,178
+133,177
+133,176
+133,175
+133,174
+133,173
+133,172
+133,171
+133,170
+133,169
+133,168
+133,167
+133,166
+133,165
+133,164
+133,163
+133,162
+133,161
+133,160
+133,159
+133,158
+133,157
+133,156
+133,155
+133,154
+133,153
+133,152
+133,151
+133,150
+133,149
+133,148
+133,147
+133,146
+133,145
+133,144
+133,143
+133,142
+133,141
+133,140
+133,139
+133,138
+133,137
+133,136
+133,135
+133,134
+133,133
+133,132
+133,131
+133,130
+133,129
+133,128
+133,118
+133,117
+133,116
+133,115
+133,114
+133,113
+133,112
+133,111
+133,110
+133,109
+133,108
+133,107
+133,106
+133,105
+133,104
+133,103
+133,102
+133,101
+133,100
+133,99
+133,98
+133,97
+133,96
+133,95
+133,94
+133,93
+133,92
+133,91
+133,90
+133,89
+133,88
+133,87
+133,86
+133,85
+133,84
+133,83
+133,82
+133,81
+133,80
+133,79
+133,78
+133,77
+133,76
+133,75
+133,74
+133,73
+133,72
+133,71
+133,70
+133,69
+133,68
+133,67
+133,66
+133,65
+133,64
+133,35
+133,34
+133,33
+133,32
+133,31
+133,30
+133,29
+133,28
+133,27
+133,26
+133,25
+133,24
+133,23
+133,22
+133,21
+133,20
+133,19
+133,18
+133,17
+133,16
+133,15
+133,14
+133,13
+133,12
+133,11
+133,10
+133,9
+133,8
+133,7
+133,6
+133,5
+133,4
+133,3
+133,2
+133,1
+133,0
+132,4
+132,3
+132,2
+132,1
+132,0
+0,62
+131,4
+131,3
+131,2
+131,1
+131,0
+5,28
+130,5
+130,4
+130,3
+130,2
+130,1
+130,0
+129,7
+129,6
+129,5
+129,4
+0,61
+129,3
+129,2
+129,1
+129,0
+128,7
+128,6
+128,5
+128,4
+128,3
+128,2
+128,1
+128,0
+127,15
+127,14
+127,13
+127,12
+127,11
+127,10
+127,9
+127,8
+127,7
+127,6
+127,5
+127,4
+127,3
+127,2
+127,1
+127,0
+126,17
+126,16
+126,15
+126,14
+126,13
+126,12
+126,11
+126,10
+126,9
+126,8
+126,7
+126,6
+126,5
+126,4
+126,3
+126,2
+126,1
+126,0
+125,192
+125,172
+125,171
+125,170
+125,169
+125,168
+125,167
+125,166
+125,165
+125,164
+125,163
+125,162
+125,161
+125,160
+125,159
+125,158
+125,157
+125,156
+125,155
+125,154
+125,153
+125,152
+125,151
+125,150
+125,149
+125,148
+125,147
+125,146
+125,145
+125,144
+125,143
+125,142
+125,141
+125,140
+125,139
+125,138
+125,137
+125,136
+125,135
+125,134
+125,133
+125,132
+125,131
+125,130
+125,129
+125,128
+125,127
+125,126
+125,125
+125,124
+125,123
+125,122
+125,121
+125,120
+125,119
+125,118
+125,117
+125,116
+125,115
+125,114
+125,113
+125,112
+125,111
+125,110
+125,109
+125,108
+125,107
+125,106
+125,105
+125,104
+125,103
+125,102
+125,101
+125,100
+125,99
+125,98
+125,97
+125,96
+125,95
+125,94
+125,93
+125,92
+125,91
+125,90
+125,89
+125,88
+125,87
+125,86
+125,85
+125,84
+125,83
+125,82
+125,81
+125,80
+125,79
+125,78
+125,77
+125,76
+125,75
+125,74
+125,73
+125,72
+125,71
+125,70
+125,69
+125,68
+125,67
+125,66
+125,65
+125,64
+125,35
+125,34
+125,33
+125,32
+125,31
+125,30
+125,29
+125,28
+125,27
+125,26
+125,25
+125,24
+125,23
+125,22
+125,21
+125,20
+125,19
+125,18
+125,17
+125,16
+125,15
+125,14
+125,13
+125,12
+125,11
+125,10
+125,9
+125,8
+125,7
+125,6
+125,5
+125,4
+125,3
+125,2
+125,1
+125,0
+124,199
+124,198
+124,197
+124,196
+124,195
+124,194
+124,193
+124,192
+124,174
+124,173
+124,172
+124,171
+124,170
+124,169
+124,168
+124,167
+124,166
+124,165
+124,164
+124,163
+124,162
+124,161
+124,160
+124,159
+124,158
+124,157
+124,156
+124,155
+124,154
+124,153
+124,152
+124,151
+124,150
+124,149
+124,148
+124,147
+124,146
+124,145
+124,144
+124,143
+124,142
+124,141
+124,140
+124,139
+124,138
+124,137
+124,136
+124,135
+124,134
+124,133
+124,132
+124,131
+124,130
+124,129
+124,128
+124,127
+124,126
+124,125
+124,124
+124,123
+124,122
+124,121
+124,120
+124,119
+124,118
+124,117
+124,116
+124,115
+124,114
+124,113
+124,112
+124,111
+124,110
+124,109
+124,108
+124,107
+124,106
+124,105
+124,104
+124,103
+124,102
+124,101
+124,100
+124,99
+124,98
+124,97
+124,96
+124,95
+124,94
+124,93
+124,92
+124,91
+124,90
+124,89
+124,88
+124,87
+124,86
+124,85
+124,84
+124,83
+124,82
+124,81
+124,80
+124,79
+124,78
+124,77
+124,76
+124,75
+124,74
+124,73
+124,72
+124,71
+124,70
+124,69
+124,68
+124,67
+124,66
+124,65
+124,64
+124,35
+124,34
+124,33
+124,32
+124,31
+124,30
+124,29
+124,28
+124,27
+124,26
+124,25
+124,24
+124,23
+124,22
+124,21
+124,20
+124,19
+124,18
+124,17
+124,16
+124,15
+124,14
+124,13
+124,12
+124,11
+124,10
+124,9
+124,8
+124,7
+124,6
+124,5
+124,4
+124,3
+124,2
+124,1
+124,0
+123,264
+123,263
+123,262
+123,261
+123,260
+123,259
+123,258
+123,257
+123,256
+123,240
+123,239
+123,238
+123,237
+123,236
+123,235
+123,234
+123,233
+123,232
+123,231
+123,230
+123,229
+123,228
+123,227
+123,226
+123,225
+123,224
+123,223
+123,222
+123,221
+123,220
+123,219
+123,218
+123,217
+123,216
+123,215
+123,214
+123,213
+123,212
+123,211
+123,210
+123,209
+123,208
+123,207
+123,206
+123,205
+123,204
+123,203
+123,202
+123,201
+123,200
+123,199
+123,198
+123,197
+123,196
+123,195
+123,194
+123,193
+123,192
+123,191
+123,190
+123,189
+123,188
+123,187
+123,186
+123,185
+123,184
+123,183
+123,182
+123,181
+123,180
+123,179
+123,178
+123,177
+123,176
+123,175
+123,174
+123,173
+123,172
+123,171
+123,170
+123,169
+123,168
+123,167
+123,166
+123,165
+123,164
+123,163
+123,162
+123,161
+123,160
+123,159
+123,158
+123,157
+123,156
+123,155
+123,154
+123,153
+123,152
+123,151
+123,150
+123,149
+123,148
+123,147
+123,146
+123,145
+123,144
+123,143
+123,142
+123,141
+123,140
+123,139
+123,138
+123,137
+123,136
+123,135
+123,134
+123,133
+123,132
+123,131
+123,130
+123,129
+123,128
+123,127
+123,126
+123,125
+123,124
+123,123
+123,122
+123,121
+123,120
+123,119
+123,118
+123,117
+123,116
+123,115
diff --git a/mariadb/ib_logfile0 b/mariadb/ib_logfile0
new file mode 100644
index 000000000..05ad2a92d
Binary files /dev/null and b/mariadb/ib_logfile0 differ
diff --git a/mariadb/ibdata1 b/mariadb/ibdata1
new file mode 100644
index 000000000..3a5c523d6
Binary files /dev/null and b/mariadb/ibdata1 differ
diff --git a/mariadb/ibtmp1 b/mariadb/ibtmp1
new file mode 100644
index 000000000..202d95cf3
Binary files /dev/null and b/mariadb/ibtmp1 differ
diff --git a/mariadb/mariadb_upgrade_info b/mariadb/mariadb_upgrade_info
new file mode 100644
index 000000000..c1f9c42fb
--- /dev/null
+++ b/mariadb/mariadb_upgrade_info
@@ -0,0 +1 @@
+11.1.3-MariaDB
\ No newline at end of file
diff --git a/mariadb/mtshop/batch.frm b/mariadb/mtshop/batch.frm
new file mode 100644
index 000000000..7f35847e9
Binary files /dev/null and b/mariadb/mtshop/batch.frm differ
diff --git a/mariadb/mtshop/batch.ibd b/mariadb/mtshop/batch.ibd
new file mode 100644
index 000000000..fe361c2f5
Binary files /dev/null and b/mariadb/mtshop/batch.ibd differ
diff --git a/mariadb/mtshop/block_content.frm b/mariadb/mtshop/block_content.frm
new file mode 100644
index 000000000..c1053aa87
Binary files /dev/null and b/mariadb/mtshop/block_content.frm differ
diff --git a/mariadb/mtshop/block_content.ibd b/mariadb/mtshop/block_content.ibd
new file mode 100644
index 000000000..35c33410e
Binary files /dev/null and b/mariadb/mtshop/block_content.ibd differ
diff --git a/mariadb/mtshop/block_content__body.frm b/mariadb/mtshop/block_content__body.frm
new file mode 100644
index 000000000..84a3d782c
Binary files /dev/null and b/mariadb/mtshop/block_content__body.frm differ
diff --git a/mariadb/mtshop/block_content__body.ibd b/mariadb/mtshop/block_content__body.ibd
new file mode 100644
index 000000000..87e61a20d
Binary files /dev/null and b/mariadb/mtshop/block_content__body.ibd differ
diff --git a/mariadb/mtshop/block_content__field_banner_layout.frm b/mariadb/mtshop/block_content__field_banner_layout.frm
new file mode 100644
index 000000000..c579723f2
Binary files /dev/null and b/mariadb/mtshop/block_content__field_banner_layout.frm differ
diff --git a/mariadb/mtshop/block_content__field_banner_layout.ibd b/mariadb/mtshop/block_content__field_banner_layout.ibd
new file mode 100644
index 000000000..d098120d3
Binary files /dev/null and b/mariadb/mtshop/block_content__field_banner_layout.ibd differ
diff --git a/mariadb/mtshop/block_content__field_block.frm b/mariadb/mtshop/block_content__field_block.frm
new file mode 100644
index 000000000..f42262f2d
Binary files /dev/null and b/mariadb/mtshop/block_content__field_block.frm differ
diff --git a/mariadb/mtshop/block_content__field_block.ibd b/mariadb/mtshop/block_content__field_block.ibd
new file mode 100644
index 000000000..bb11b117b
Binary files /dev/null and b/mariadb/mtshop/block_content__field_block.ibd differ
diff --git a/mariadb/mtshop/block_content__field_countdown.frm b/mariadb/mtshop/block_content__field_countdown.frm
new file mode 100644
index 000000000..e4755df25
Binary files /dev/null and b/mariadb/mtshop/block_content__field_countdown.frm differ
diff --git a/mariadb/mtshop/block_content__field_countdown.ibd b/mariadb/mtshop/block_content__field_countdown.ibd
new file mode 100644
index 000000000..f1bf0bf70
Binary files /dev/null and b/mariadb/mtshop/block_content__field_countdown.ibd differ
diff --git a/mariadb/mtshop/block_content__field_cta_format.frm b/mariadb/mtshop/block_content__field_cta_format.frm
new file mode 100644
index 000000000..461871db7
Binary files /dev/null and b/mariadb/mtshop/block_content__field_cta_format.frm differ
diff --git a/mariadb/mtshop/block_content__field_cta_format.ibd b/mariadb/mtshop/block_content__field_cta_format.ibd
new file mode 100644
index 000000000..cb74cfb6c
Binary files /dev/null and b/mariadb/mtshop/block_content__field_cta_format.ibd differ
diff --git a/mariadb/mtshop/block_content__field_deals_layout.frm b/mariadb/mtshop/block_content__field_deals_layout.frm
new file mode 100644
index 000000000..8da6d6439
Binary files /dev/null and b/mariadb/mtshop/block_content__field_deals_layout.frm differ
diff --git a/mariadb/mtshop/block_content__field_deals_layout.ibd b/mariadb/mtshop/block_content__field_deals_layout.ibd
new file mode 100644
index 000000000..3c6ea04db
Binary files /dev/null and b/mariadb/mtshop/block_content__field_deals_layout.ibd differ
diff --git a/mariadb/mtshop/block_content__field_feature_layout.frm b/mariadb/mtshop/block_content__field_feature_layout.frm
new file mode 100644
index 000000000..d71c421e9
Binary files /dev/null and b/mariadb/mtshop/block_content__field_feature_layout.frm differ
diff --git a/mariadb/mtshop/block_content__field_feature_layout.ibd b/mariadb/mtshop/block_content__field_feature_layout.ibd
new file mode 100644
index 000000000..4db16fff1
Binary files /dev/null and b/mariadb/mtshop/block_content__field_feature_layout.ibd differ
diff --git a/mariadb/mtshop/block_content__field_image.frm b/mariadb/mtshop/block_content__field_image.frm
new file mode 100644
index 000000000..e25f6842f
Binary files /dev/null and b/mariadb/mtshop/block_content__field_image.frm differ
diff --git a/mariadb/mtshop/block_content__field_image.ibd b/mariadb/mtshop/block_content__field_image.ibd
new file mode 100644
index 000000000..50e42943b
Binary files /dev/null and b/mariadb/mtshop/block_content__field_image.ibd differ
diff --git a/mariadb/mtshop/block_content__field_link.frm b/mariadb/mtshop/block_content__field_link.frm
new file mode 100644
index 000000000..c3b721431
Binary files /dev/null and b/mariadb/mtshop/block_content__field_link.frm differ
diff --git a/mariadb/mtshop/block_content__field_link.ibd b/mariadb/mtshop/block_content__field_link.ibd
new file mode 100644
index 000000000..914ed0bf7
Binary files /dev/null and b/mariadb/mtshop/block_content__field_link.ibd differ
diff --git a/mariadb/mtshop/block_content__field_media_format.frm b/mariadb/mtshop/block_content__field_media_format.frm
new file mode 100644
index 000000000..6c93145d7
Binary files /dev/null and b/mariadb/mtshop/block_content__field_media_format.frm differ
diff --git a/mariadb/mtshop/block_content__field_media_format.ibd b/mariadb/mtshop/block_content__field_media_format.ibd
new file mode 100644
index 000000000..5d891c67a
Binary files /dev/null and b/mariadb/mtshop/block_content__field_media_format.ibd differ
diff --git a/mariadb/mtshop/block_content__field_product_block.frm b/mariadb/mtshop/block_content__field_product_block.frm
new file mode 100644
index 000000000..44c75e7ea
Binary files /dev/null and b/mariadb/mtshop/block_content__field_product_block.frm differ
diff --git a/mariadb/mtshop/block_content__field_product_block.ibd b/mariadb/mtshop/block_content__field_product_block.ibd
new file mode 100644
index 000000000..6a411be06
Binary files /dev/null and b/mariadb/mtshop/block_content__field_product_block.ibd differ
diff --git a/mariadb/mtshop/block_content__field_slide_type.frm b/mariadb/mtshop/block_content__field_slide_type.frm
new file mode 100644
index 000000000..c17ef596d
Binary files /dev/null and b/mariadb/mtshop/block_content__field_slide_type.frm differ
diff --git a/mariadb/mtshop/block_content__field_slide_type.ibd b/mariadb/mtshop/block_content__field_slide_type.ibd
new file mode 100644
index 000000000..734d92c5a
Binary files /dev/null and b/mariadb/mtshop/block_content__field_slide_type.ibd differ
diff --git a/mariadb/mtshop/block_content__field_slider_block.frm b/mariadb/mtshop/block_content__field_slider_block.frm
new file mode 100644
index 000000000..43f0b43f2
Binary files /dev/null and b/mariadb/mtshop/block_content__field_slider_block.frm differ
diff --git a/mariadb/mtshop/block_content__field_slider_block.ibd b/mariadb/mtshop/block_content__field_slider_block.ibd
new file mode 100644
index 000000000..30df8e25a
Binary files /dev/null and b/mariadb/mtshop/block_content__field_slider_block.ibd differ
diff --git a/mariadb/mtshop/block_content__field_video.frm b/mariadb/mtshop/block_content__field_video.frm
new file mode 100644
index 000000000..b894fb5e0
Binary files /dev/null and b/mariadb/mtshop/block_content__field_video.frm differ
diff --git a/mariadb/mtshop/block_content__field_video.ibd b/mariadb/mtshop/block_content__field_video.ibd
new file mode 100644
index 000000000..b1d6fa075
Binary files /dev/null and b/mariadb/mtshop/block_content__field_video.ibd differ
diff --git a/mariadb/mtshop/block_content_field_data.frm b/mariadb/mtshop/block_content_field_data.frm
new file mode 100644
index 000000000..21d132bfa
Binary files /dev/null and b/mariadb/mtshop/block_content_field_data.frm differ
diff --git a/mariadb/mtshop/block_content_field_data.ibd b/mariadb/mtshop/block_content_field_data.ibd
new file mode 100644
index 000000000..c8938bbcd
Binary files /dev/null and b/mariadb/mtshop/block_content_field_data.ibd differ
diff --git a/mariadb/mtshop/block_content_field_revision.frm b/mariadb/mtshop/block_content_field_revision.frm
new file mode 100644
index 000000000..efb8dcccc
Binary files /dev/null and b/mariadb/mtshop/block_content_field_revision.frm differ
diff --git a/mariadb/mtshop/block_content_field_revision.ibd b/mariadb/mtshop/block_content_field_revision.ibd
new file mode 100644
index 000000000..f915dd983
Binary files /dev/null and b/mariadb/mtshop/block_content_field_revision.ibd differ
diff --git a/mariadb/mtshop/block_content_revision.frm b/mariadb/mtshop/block_content_revision.frm
new file mode 100644
index 000000000..ced84fab2
Binary files /dev/null and b/mariadb/mtshop/block_content_revision.frm differ
diff --git a/mariadb/mtshop/block_content_revision.ibd b/mariadb/mtshop/block_content_revision.ibd
new file mode 100644
index 000000000..48aebb166
Binary files /dev/null and b/mariadb/mtshop/block_content_revision.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__body.frm b/mariadb/mtshop/block_content_revision__body.frm
new file mode 100644
index 000000000..61df2c12e
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__body.frm differ
diff --git a/mariadb/mtshop/block_content_revision__body.ibd b/mariadb/mtshop/block_content_revision__body.ibd
new file mode 100644
index 000000000..70d1d3067
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__body.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_banner_layout.frm b/mariadb/mtshop/block_content_revision__field_banner_layout.frm
new file mode 100644
index 000000000..8df490aba
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_banner_layout.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_banner_layout.ibd b/mariadb/mtshop/block_content_revision__field_banner_layout.ibd
new file mode 100644
index 000000000..8f6b5f4d0
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_banner_layout.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_block.frm b/mariadb/mtshop/block_content_revision__field_block.frm
new file mode 100644
index 000000000..3af709333
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_block.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_block.ibd b/mariadb/mtshop/block_content_revision__field_block.ibd
new file mode 100644
index 000000000..7582377fa
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_block.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_countdown.frm b/mariadb/mtshop/block_content_revision__field_countdown.frm
new file mode 100644
index 000000000..a83f8d4d2
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_countdown.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_countdown.ibd b/mariadb/mtshop/block_content_revision__field_countdown.ibd
new file mode 100644
index 000000000..c8ccf7db2
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_countdown.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_cta_format.frm b/mariadb/mtshop/block_content_revision__field_cta_format.frm
new file mode 100644
index 000000000..e3b0c5a80
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_cta_format.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_cta_format.ibd b/mariadb/mtshop/block_content_revision__field_cta_format.ibd
new file mode 100644
index 000000000..ab8f3d423
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_cta_format.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_deals_layout.frm b/mariadb/mtshop/block_content_revision__field_deals_layout.frm
new file mode 100644
index 000000000..fb54eab0f
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_deals_layout.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_deals_layout.ibd b/mariadb/mtshop/block_content_revision__field_deals_layout.ibd
new file mode 100644
index 000000000..3bd8047df
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_deals_layout.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_feature_layout.frm b/mariadb/mtshop/block_content_revision__field_feature_layout.frm
new file mode 100644
index 000000000..4766f8a0c
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_feature_layout.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_feature_layout.ibd b/mariadb/mtshop/block_content_revision__field_feature_layout.ibd
new file mode 100644
index 000000000..522da30ff
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_feature_layout.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_image.frm b/mariadb/mtshop/block_content_revision__field_image.frm
new file mode 100644
index 000000000..0aabba7f4
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_image.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_image.ibd b/mariadb/mtshop/block_content_revision__field_image.ibd
new file mode 100644
index 000000000..6f744fdc1
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_image.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_link.frm b/mariadb/mtshop/block_content_revision__field_link.frm
new file mode 100644
index 000000000..6747ef94c
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_link.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_link.ibd b/mariadb/mtshop/block_content_revision__field_link.ibd
new file mode 100644
index 000000000..cba28acc4
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_link.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_media_format.frm b/mariadb/mtshop/block_content_revision__field_media_format.frm
new file mode 100644
index 000000000..9857b4594
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_media_format.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_media_format.ibd b/mariadb/mtshop/block_content_revision__field_media_format.ibd
new file mode 100644
index 000000000..5c7fbc581
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_media_format.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_product_block.frm b/mariadb/mtshop/block_content_revision__field_product_block.frm
new file mode 100644
index 000000000..cfff2e905
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_product_block.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_product_block.ibd b/mariadb/mtshop/block_content_revision__field_product_block.ibd
new file mode 100644
index 000000000..160708bab
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_product_block.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_slide_type.frm b/mariadb/mtshop/block_content_revision__field_slide_type.frm
new file mode 100644
index 000000000..e03c4ba3b
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_slide_type.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_slide_type.ibd b/mariadb/mtshop/block_content_revision__field_slide_type.ibd
new file mode 100644
index 000000000..9003b53b0
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_slide_type.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_slider_block.frm b/mariadb/mtshop/block_content_revision__field_slider_block.frm
new file mode 100644
index 000000000..ce5eb344a
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_slider_block.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_slider_block.ibd b/mariadb/mtshop/block_content_revision__field_slider_block.ibd
new file mode 100644
index 000000000..679829bd5
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_slider_block.ibd differ
diff --git a/mariadb/mtshop/block_content_revision__field_video.frm b/mariadb/mtshop/block_content_revision__field_video.frm
new file mode 100644
index 000000000..537a1cb50
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_video.frm differ
diff --git a/mariadb/mtshop/block_content_revision__field_video.ibd b/mariadb/mtshop/block_content_revision__field_video.ibd
new file mode 100644
index 000000000..f6b5651ba
Binary files /dev/null and b/mariadb/mtshop/block_content_revision__field_video.ibd differ
diff --git a/mariadb/mtshop/cache_advagg.frm b/mariadb/mtshop/cache_advagg.frm
new file mode 100644
index 000000000..a662df87e
Binary files /dev/null and b/mariadb/mtshop/cache_advagg.frm differ
diff --git a/mariadb/mtshop/cache_advagg.ibd b/mariadb/mtshop/cache_advagg.ibd
new file mode 100644
index 000000000..0542c83fd
Binary files /dev/null and b/mariadb/mtshop/cache_advagg.ibd differ
diff --git a/mariadb/mtshop/cache_bootstrap.frm b/mariadb/mtshop/cache_bootstrap.frm
new file mode 100644
index 000000000..8d422f545
Binary files /dev/null and b/mariadb/mtshop/cache_bootstrap.frm differ
diff --git a/mariadb/mtshop/cache_bootstrap.ibd b/mariadb/mtshop/cache_bootstrap.ibd
new file mode 100644
index 000000000..7d268da6a
Binary files /dev/null and b/mariadb/mtshop/cache_bootstrap.ibd differ
diff --git a/mariadb/mtshop/cache_config.frm b/mariadb/mtshop/cache_config.frm
new file mode 100644
index 000000000..9fda224ea
Binary files /dev/null and b/mariadb/mtshop/cache_config.frm differ
diff --git a/mariadb/mtshop/cache_config.ibd b/mariadb/mtshop/cache_config.ibd
new file mode 100644
index 000000000..db7f839e9
Binary files /dev/null and b/mariadb/mtshop/cache_config.ibd differ
diff --git a/mariadb/mtshop/cache_container.frm b/mariadb/mtshop/cache_container.frm
new file mode 100644
index 000000000..f9a84fcf5
Binary files /dev/null and b/mariadb/mtshop/cache_container.frm differ
diff --git a/mariadb/mtshop/cache_container.ibd b/mariadb/mtshop/cache_container.ibd
new file mode 100644
index 000000000..f8e1e8674
Binary files /dev/null and b/mariadb/mtshop/cache_container.ibd differ
diff --git a/mariadb/mtshop/cache_data.frm b/mariadb/mtshop/cache_data.frm
new file mode 100644
index 000000000..fce1e1b31
Binary files /dev/null and b/mariadb/mtshop/cache_data.frm differ
diff --git a/mariadb/mtshop/cache_data.ibd b/mariadb/mtshop/cache_data.ibd
new file mode 100644
index 000000000..a6fea3d11
Binary files /dev/null and b/mariadb/mtshop/cache_data.ibd differ
diff --git a/mariadb/mtshop/cache_default.frm b/mariadb/mtshop/cache_default.frm
new file mode 100644
index 000000000..42e10ac19
Binary files /dev/null and b/mariadb/mtshop/cache_default.frm differ
diff --git a/mariadb/mtshop/cache_default.ibd b/mariadb/mtshop/cache_default.ibd
new file mode 100644
index 000000000..55de8cbda
Binary files /dev/null and b/mariadb/mtshop/cache_default.ibd differ
diff --git a/mariadb/mtshop/cache_discovery.frm b/mariadb/mtshop/cache_discovery.frm
new file mode 100644
index 000000000..66b2ca4c1
Binary files /dev/null and b/mariadb/mtshop/cache_discovery.frm differ
diff --git a/mariadb/mtshop/cache_discovery.ibd b/mariadb/mtshop/cache_discovery.ibd
new file mode 100644
index 000000000..7c27411b7
Binary files /dev/null and b/mariadb/mtshop/cache_discovery.ibd differ
diff --git a/mariadb/mtshop/cache_dynamic_page_cache.frm b/mariadb/mtshop/cache_dynamic_page_cache.frm
new file mode 100644
index 000000000..c08e3b126
Binary files /dev/null and b/mariadb/mtshop/cache_dynamic_page_cache.frm differ
diff --git a/mariadb/mtshop/cache_dynamic_page_cache.ibd b/mariadb/mtshop/cache_dynamic_page_cache.ibd
new file mode 100644
index 000000000..923cf7616
Binary files /dev/null and b/mariadb/mtshop/cache_dynamic_page_cache.ibd differ
diff --git a/mariadb/mtshop/cache_entity.frm b/mariadb/mtshop/cache_entity.frm
new file mode 100644
index 000000000..d4e70e9db
Binary files /dev/null and b/mariadb/mtshop/cache_entity.frm differ
diff --git a/mariadb/mtshop/cache_entity.ibd b/mariadb/mtshop/cache_entity.ibd
new file mode 100644
index 000000000..99df6ac2c
Binary files /dev/null and b/mariadb/mtshop/cache_entity.ibd differ
diff --git a/mariadb/mtshop/cache_menu.frm b/mariadb/mtshop/cache_menu.frm
new file mode 100644
index 000000000..bd42957ce
Binary files /dev/null and b/mariadb/mtshop/cache_menu.frm differ
diff --git a/mariadb/mtshop/cache_menu.ibd b/mariadb/mtshop/cache_menu.ibd
new file mode 100644
index 000000000..3af270943
Binary files /dev/null and b/mariadb/mtshop/cache_menu.ibd differ
diff --git a/mariadb/mtshop/cache_page.frm b/mariadb/mtshop/cache_page.frm
new file mode 100644
index 000000000..189c6a153
Binary files /dev/null and b/mariadb/mtshop/cache_page.frm differ
diff --git a/mariadb/mtshop/cache_page.ibd b/mariadb/mtshop/cache_page.ibd
new file mode 100644
index 000000000..95f8431c7
Binary files /dev/null and b/mariadb/mtshop/cache_page.ibd differ
diff --git a/mariadb/mtshop/cache_render.frm b/mariadb/mtshop/cache_render.frm
new file mode 100644
index 000000000..97eb9ebb5
Binary files /dev/null and b/mariadb/mtshop/cache_render.frm differ
diff --git a/mariadb/mtshop/cache_render.ibd b/mariadb/mtshop/cache_render.ibd
new file mode 100644
index 000000000..694740833
Binary files /dev/null and b/mariadb/mtshop/cache_render.ibd differ
diff --git a/mariadb/mtshop/cache_toolbar.frm b/mariadb/mtshop/cache_toolbar.frm
new file mode 100644
index 000000000..5c7faedc9
Binary files /dev/null and b/mariadb/mtshop/cache_toolbar.frm differ
diff --git a/mariadb/mtshop/cache_toolbar.ibd b/mariadb/mtshop/cache_toolbar.ibd
new file mode 100644
index 000000000..f37a01dab
Binary files /dev/null and b/mariadb/mtshop/cache_toolbar.ibd differ
diff --git a/mariadb/mtshop/cachetags.frm b/mariadb/mtshop/cachetags.frm
new file mode 100644
index 000000000..4c1c4cbdd
Binary files /dev/null and b/mariadb/mtshop/cachetags.frm differ
diff --git a/mariadb/mtshop/cachetags.ibd b/mariadb/mtshop/cachetags.ibd
new file mode 100644
index 000000000..ac0fb72a3
Binary files /dev/null and b/mariadb/mtshop/cachetags.ibd differ
diff --git a/mariadb/mtshop/comment.frm b/mariadb/mtshop/comment.frm
new file mode 100644
index 000000000..6518297f2
Binary files /dev/null and b/mariadb/mtshop/comment.frm differ
diff --git a/mariadb/mtshop/comment.ibd b/mariadb/mtshop/comment.ibd
new file mode 100644
index 000000000..3f18a5716
Binary files /dev/null and b/mariadb/mtshop/comment.ibd differ
diff --git a/mariadb/mtshop/comment__comment_body.frm b/mariadb/mtshop/comment__comment_body.frm
new file mode 100644
index 000000000..89cc99c3f
Binary files /dev/null and b/mariadb/mtshop/comment__comment_body.frm differ
diff --git a/mariadb/mtshop/comment__comment_body.ibd b/mariadb/mtshop/comment__comment_body.ibd
new file mode 100644
index 000000000..1a9d9eead
Binary files /dev/null and b/mariadb/mtshop/comment__comment_body.ibd differ
diff --git a/mariadb/mtshop/comment_entity_statistics.frm b/mariadb/mtshop/comment_entity_statistics.frm
new file mode 100644
index 000000000..94f085e0e
Binary files /dev/null and b/mariadb/mtshop/comment_entity_statistics.frm differ
diff --git a/mariadb/mtshop/comment_entity_statistics.ibd b/mariadb/mtshop/comment_entity_statistics.ibd
new file mode 100644
index 000000000..691fb6757
Binary files /dev/null and b/mariadb/mtshop/comment_entity_statistics.ibd differ
diff --git a/mariadb/mtshop/comment_field_data.frm b/mariadb/mtshop/comment_field_data.frm
new file mode 100644
index 000000000..401940e8b
Binary files /dev/null and b/mariadb/mtshop/comment_field_data.frm differ
diff --git a/mariadb/mtshop/comment_field_data.ibd b/mariadb/mtshop/comment_field_data.ibd
new file mode 100644
index 000000000..9d1a8d8f1
Binary files /dev/null and b/mariadb/mtshop/comment_field_data.ibd differ
diff --git a/mariadb/mtshop/commerce_number_pattern_sequence.frm b/mariadb/mtshop/commerce_number_pattern_sequence.frm
new file mode 100644
index 000000000..5920012d0
Binary files /dev/null and b/mariadb/mtshop/commerce_number_pattern_sequence.frm differ
diff --git a/mariadb/mtshop/commerce_number_pattern_sequence.ibd b/mariadb/mtshop/commerce_number_pattern_sequence.ibd
new file mode 100644
index 000000000..6441d1227
Binary files /dev/null and b/mariadb/mtshop/commerce_number_pattern_sequence.ibd differ
diff --git a/mariadb/mtshop/commerce_order.frm b/mariadb/mtshop/commerce_order.frm
new file mode 100644
index 000000000..cbf881e9f
Binary files /dev/null and b/mariadb/mtshop/commerce_order.frm differ
diff --git a/mariadb/mtshop/commerce_order.ibd b/mariadb/mtshop/commerce_order.ibd
new file mode 100644
index 000000000..1f683a883
Binary files /dev/null and b/mariadb/mtshop/commerce_order.ibd differ
diff --git a/mariadb/mtshop/commerce_order__adjustments.frm b/mariadb/mtshop/commerce_order__adjustments.frm
new file mode 100644
index 000000000..f3981e713
Binary files /dev/null and b/mariadb/mtshop/commerce_order__adjustments.frm differ
diff --git a/mariadb/mtshop/commerce_order__adjustments.ibd b/mariadb/mtshop/commerce_order__adjustments.ibd
new file mode 100644
index 000000000..914e2eb91
Binary files /dev/null and b/mariadb/mtshop/commerce_order__adjustments.ibd differ
diff --git a/mariadb/mtshop/commerce_order__coupons.frm b/mariadb/mtshop/commerce_order__coupons.frm
new file mode 100644
index 000000000..c735effb5
Binary files /dev/null and b/mariadb/mtshop/commerce_order__coupons.frm differ
diff --git a/mariadb/mtshop/commerce_order__coupons.ibd b/mariadb/mtshop/commerce_order__coupons.ibd
new file mode 100644
index 000000000..1f3e65660
Binary files /dev/null and b/mariadb/mtshop/commerce_order__coupons.ibd differ
diff --git a/mariadb/mtshop/commerce_order__order_items.frm b/mariadb/mtshop/commerce_order__order_items.frm
new file mode 100644
index 000000000..c79c383da
Binary files /dev/null and b/mariadb/mtshop/commerce_order__order_items.frm differ
diff --git a/mariadb/mtshop/commerce_order__order_items.ibd b/mariadb/mtshop/commerce_order__order_items.ibd
new file mode 100644
index 000000000..120b1aa55
Binary files /dev/null and b/mariadb/mtshop/commerce_order__order_items.ibd differ
diff --git a/mariadb/mtshop/commerce_order__shipments.frm b/mariadb/mtshop/commerce_order__shipments.frm
new file mode 100644
index 000000000..f38437376
Binary files /dev/null and b/mariadb/mtshop/commerce_order__shipments.frm differ
diff --git a/mariadb/mtshop/commerce_order__shipments.ibd b/mariadb/mtshop/commerce_order__shipments.ibd
new file mode 100644
index 000000000..c170d6396
Binary files /dev/null and b/mariadb/mtshop/commerce_order__shipments.ibd differ
diff --git a/mariadb/mtshop/commerce_order_item.frm b/mariadb/mtshop/commerce_order_item.frm
new file mode 100644
index 000000000..91bcf082d
Binary files /dev/null and b/mariadb/mtshop/commerce_order_item.frm differ
diff --git a/mariadb/mtshop/commerce_order_item.ibd b/mariadb/mtshop/commerce_order_item.ibd
new file mode 100644
index 000000000..78b943431
Binary files /dev/null and b/mariadb/mtshop/commerce_order_item.ibd differ
diff --git a/mariadb/mtshop/commerce_order_item__adjustments.frm b/mariadb/mtshop/commerce_order_item__adjustments.frm
new file mode 100644
index 000000000..810be70ab
Binary files /dev/null and b/mariadb/mtshop/commerce_order_item__adjustments.frm differ
diff --git a/mariadb/mtshop/commerce_order_item__adjustments.ibd b/mariadb/mtshop/commerce_order_item__adjustments.ibd
new file mode 100644
index 000000000..1f6e9c9fb
Binary files /dev/null and b/mariadb/mtshop/commerce_order_item__adjustments.ibd differ
diff --git a/mariadb/mtshop/commerce_payment.frm b/mariadb/mtshop/commerce_payment.frm
new file mode 100644
index 000000000..78d32b330
Binary files /dev/null and b/mariadb/mtshop/commerce_payment.frm differ
diff --git a/mariadb/mtshop/commerce_payment.ibd b/mariadb/mtshop/commerce_payment.ibd
new file mode 100644
index 000000000..73a9a06f9
Binary files /dev/null and b/mariadb/mtshop/commerce_payment.ibd differ
diff --git a/mariadb/mtshop/commerce_payment_method.frm b/mariadb/mtshop/commerce_payment_method.frm
new file mode 100644
index 000000000..b6bdf5ff3
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method.frm differ
diff --git a/mariadb/mtshop/commerce_payment_method.ibd b/mariadb/mtshop/commerce_payment_method.ibd
new file mode 100644
index 000000000..3fdb9cd98
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method.ibd differ
diff --git a/mariadb/mtshop/commerce_payment_method__card_exp_month.frm b/mariadb/mtshop/commerce_payment_method__card_exp_month.frm
new file mode 100644
index 000000000..90ad3df71
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__card_exp_month.frm differ
diff --git a/mariadb/mtshop/commerce_payment_method__card_exp_month.ibd b/mariadb/mtshop/commerce_payment_method__card_exp_month.ibd
new file mode 100644
index 000000000..331e578c1
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__card_exp_month.ibd differ
diff --git a/mariadb/mtshop/commerce_payment_method__card_exp_year.frm b/mariadb/mtshop/commerce_payment_method__card_exp_year.frm
new file mode 100644
index 000000000..536449709
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__card_exp_year.frm differ
diff --git a/mariadb/mtshop/commerce_payment_method__card_exp_year.ibd b/mariadb/mtshop/commerce_payment_method__card_exp_year.ibd
new file mode 100644
index 000000000..6a7e8c49a
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__card_exp_year.ibd differ
diff --git a/mariadb/mtshop/commerce_payment_method__card_number.frm b/mariadb/mtshop/commerce_payment_method__card_number.frm
new file mode 100644
index 000000000..54f7cd73a
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__card_number.frm differ
diff --git a/mariadb/mtshop/commerce_payment_method__card_number.ibd b/mariadb/mtshop/commerce_payment_method__card_number.ibd
new file mode 100644
index 000000000..84f7dfcf3
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__card_number.ibd differ
diff --git a/mariadb/mtshop/commerce_payment_method__card_type.frm b/mariadb/mtshop/commerce_payment_method__card_type.frm
new file mode 100644
index 000000000..031f94cfd
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__card_type.frm differ
diff --git a/mariadb/mtshop/commerce_payment_method__card_type.ibd b/mariadb/mtshop/commerce_payment_method__card_type.ibd
new file mode 100644
index 000000000..5e2c75111
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__card_type.ibd differ
diff --git a/mariadb/mtshop/commerce_payment_method__paypal_mail.frm b/mariadb/mtshop/commerce_payment_method__paypal_mail.frm
new file mode 100644
index 000000000..1dcdd555f
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__paypal_mail.frm differ
diff --git a/mariadb/mtshop/commerce_payment_method__paypal_mail.ibd b/mariadb/mtshop/commerce_payment_method__paypal_mail.ibd
new file mode 100644
index 000000000..58c6a8547
Binary files /dev/null and b/mariadb/mtshop/commerce_payment_method__paypal_mail.ibd differ
diff --git a/mariadb/mtshop/commerce_product.frm b/mariadb/mtshop/commerce_product.frm
new file mode 100644
index 000000000..a1daa4e45
Binary files /dev/null and b/mariadb/mtshop/commerce_product.frm differ
diff --git a/mariadb/mtshop/commerce_product.ibd b/mariadb/mtshop/commerce_product.ibd
new file mode 100644
index 000000000..3d630cf9b
Binary files /dev/null and b/mariadb/mtshop/commerce_product.ibd differ
diff --git a/mariadb/mtshop/commerce_product__body.frm b/mariadb/mtshop/commerce_product__body.frm
new file mode 100644
index 000000000..25b3527da
Binary files /dev/null and b/mariadb/mtshop/commerce_product__body.frm differ
diff --git a/mariadb/mtshop/commerce_product__body.ibd b/mariadb/mtshop/commerce_product__body.ibd
new file mode 100644
index 000000000..c0263e65f
Binary files /dev/null and b/mariadb/mtshop/commerce_product__body.ibd differ
diff --git a/mariadb/mtshop/commerce_product__field_badge.frm b/mariadb/mtshop/commerce_product__field_badge.frm
new file mode 100644
index 000000000..1ea1120d4
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_badge.frm differ
diff --git a/mariadb/mtshop/commerce_product__field_badge.ibd b/mariadb/mtshop/commerce_product__field_badge.ibd
new file mode 100644
index 000000000..99be813d6
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_badge.ibd differ
diff --git a/mariadb/mtshop/commerce_product__field_product_brand.frm b/mariadb/mtshop/commerce_product__field_product_brand.frm
new file mode 100644
index 000000000..f5475574b
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_product_brand.frm differ
diff --git a/mariadb/mtshop/commerce_product__field_product_brand.ibd b/mariadb/mtshop/commerce_product__field_product_brand.ibd
new file mode 100644
index 000000000..e47268053
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_product_brand.ibd differ
diff --git a/mariadb/mtshop/commerce_product__field_product_category.frm b/mariadb/mtshop/commerce_product__field_product_category.frm
new file mode 100644
index 000000000..6633fdf2b
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_product_category.frm differ
diff --git a/mariadb/mtshop/commerce_product__field_product_category.ibd b/mariadb/mtshop/commerce_product__field_product_category.ibd
new file mode 100644
index 000000000..8082dfa73
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_product_category.ibd differ
diff --git a/mariadb/mtshop/commerce_product__field_product_review.frm b/mariadb/mtshop/commerce_product__field_product_review.frm
new file mode 100644
index 000000000..ea9362473
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_product_review.frm differ
diff --git a/mariadb/mtshop/commerce_product__field_product_review.ibd b/mariadb/mtshop/commerce_product__field_product_review.ibd
new file mode 100644
index 000000000..ff7e606b1
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_product_review.ibd differ
diff --git a/mariadb/mtshop/commerce_product__field_ratings.frm b/mariadb/mtshop/commerce_product__field_ratings.frm
new file mode 100644
index 000000000..d438b1e24
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_ratings.frm differ
diff --git a/mariadb/mtshop/commerce_product__field_ratings.ibd b/mariadb/mtshop/commerce_product__field_ratings.ibd
new file mode 100644
index 000000000..c419ea4e3
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_ratings.ibd differ
diff --git a/mariadb/mtshop/commerce_product__field_short_description.frm b/mariadb/mtshop/commerce_product__field_short_description.frm
new file mode 100644
index 000000000..e752c13a5
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_short_description.frm differ
diff --git a/mariadb/mtshop/commerce_product__field_short_description.ibd b/mariadb/mtshop/commerce_product__field_short_description.ibd
new file mode 100644
index 000000000..06f4f4f75
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_short_description.ibd differ
diff --git a/mariadb/mtshop/commerce_product__field_special_category.frm b/mariadb/mtshop/commerce_product__field_special_category.frm
new file mode 100644
index 000000000..cc630a360
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_special_category.frm differ
diff --git a/mariadb/mtshop/commerce_product__field_special_category.ibd b/mariadb/mtshop/commerce_product__field_special_category.ibd
new file mode 100644
index 000000000..7931bb886
Binary files /dev/null and b/mariadb/mtshop/commerce_product__field_special_category.ibd differ
diff --git a/mariadb/mtshop/commerce_product__stores.frm b/mariadb/mtshop/commerce_product__stores.frm
new file mode 100644
index 000000000..298b8efbb
Binary files /dev/null and b/mariadb/mtshop/commerce_product__stores.frm differ
diff --git a/mariadb/mtshop/commerce_product__stores.ibd b/mariadb/mtshop/commerce_product__stores.ibd
new file mode 100644
index 000000000..d16b5e725
Binary files /dev/null and b/mariadb/mtshop/commerce_product__stores.ibd differ
diff --git a/mariadb/mtshop/commerce_product__variations.frm b/mariadb/mtshop/commerce_product__variations.frm
new file mode 100644
index 000000000..ba6128ff7
Binary files /dev/null and b/mariadb/mtshop/commerce_product__variations.frm differ
diff --git a/mariadb/mtshop/commerce_product__variations.ibd b/mariadb/mtshop/commerce_product__variations.ibd
new file mode 100644
index 000000000..ce9119c27
Binary files /dev/null and b/mariadb/mtshop/commerce_product__variations.ibd differ
diff --git a/mariadb/mtshop/commerce_product_attribute_value.frm b/mariadb/mtshop/commerce_product_attribute_value.frm
new file mode 100644
index 000000000..33c9865c5
Binary files /dev/null and b/mariadb/mtshop/commerce_product_attribute_value.frm differ
diff --git a/mariadb/mtshop/commerce_product_attribute_value.ibd b/mariadb/mtshop/commerce_product_attribute_value.ibd
new file mode 100644
index 000000000..163a79105
Binary files /dev/null and b/mariadb/mtshop/commerce_product_attribute_value.ibd differ
diff --git a/mariadb/mtshop/commerce_product_attribute_value__field_color.frm b/mariadb/mtshop/commerce_product_attribute_value__field_color.frm
new file mode 100644
index 000000000..5859cbb1c
Binary files /dev/null and b/mariadb/mtshop/commerce_product_attribute_value__field_color.frm differ
diff --git a/mariadb/mtshop/commerce_product_attribute_value__field_color.ibd b/mariadb/mtshop/commerce_product_attribute_value__field_color.ibd
new file mode 100644
index 000000000..9c2dae2cc
Binary files /dev/null and b/mariadb/mtshop/commerce_product_attribute_value__field_color.ibd differ
diff --git a/mariadb/mtshop/commerce_product_attribute_value_field_data.frm b/mariadb/mtshop/commerce_product_attribute_value_field_data.frm
new file mode 100644
index 000000000..407609903
Binary files /dev/null and b/mariadb/mtshop/commerce_product_attribute_value_field_data.frm differ
diff --git a/mariadb/mtshop/commerce_product_attribute_value_field_data.ibd b/mariadb/mtshop/commerce_product_attribute_value_field_data.ibd
new file mode 100644
index 000000000..ac06adb02
Binary files /dev/null and b/mariadb/mtshop/commerce_product_attribute_value_field_data.ibd differ
diff --git a/mariadb/mtshop/commerce_product_field_data.frm b/mariadb/mtshop/commerce_product_field_data.frm
new file mode 100644
index 000000000..5e9ed6b21
Binary files /dev/null and b/mariadb/mtshop/commerce_product_field_data.frm differ
diff --git a/mariadb/mtshop/commerce_product_field_data.ibd b/mariadb/mtshop/commerce_product_field_data.ibd
new file mode 100644
index 000000000..a043fa977
Binary files /dev/null and b/mariadb/mtshop/commerce_product_field_data.ibd differ
diff --git a/mariadb/mtshop/commerce_product_variation.frm b/mariadb/mtshop/commerce_product_variation.frm
new file mode 100644
index 000000000..478e2682b
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation.frm differ
diff --git a/mariadb/mtshop/commerce_product_variation.ibd b/mariadb/mtshop/commerce_product_variation.ibd
new file mode 100644
index 000000000..5c937aa82
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation.ibd differ
diff --git a/mariadb/mtshop/commerce_product_variation__attribute_color.frm b/mariadb/mtshop/commerce_product_variation__attribute_color.frm
new file mode 100644
index 000000000..75948190f
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__attribute_color.frm differ
diff --git a/mariadb/mtshop/commerce_product_variation__attribute_color.ibd b/mariadb/mtshop/commerce_product_variation__attribute_color.ibd
new file mode 100644
index 000000000..b0bfce2f9
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__attribute_color.ibd differ
diff --git a/mariadb/mtshop/commerce_product_variation__attribute_shoe_size.frm b/mariadb/mtshop/commerce_product_variation__attribute_shoe_size.frm
new file mode 100644
index 000000000..af135e4ad
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__attribute_shoe_size.frm differ
diff --git a/mariadb/mtshop/commerce_product_variation__attribute_shoe_size.ibd b/mariadb/mtshop/commerce_product_variation__attribute_shoe_size.ibd
new file mode 100644
index 000000000..1edc3a408
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__attribute_shoe_size.ibd differ
diff --git a/mariadb/mtshop/commerce_product_variation__attribute_size.frm b/mariadb/mtshop/commerce_product_variation__attribute_size.frm
new file mode 100644
index 000000000..bd2810b14
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__attribute_size.frm differ
diff --git a/mariadb/mtshop/commerce_product_variation__attribute_size.ibd b/mariadb/mtshop/commerce_product_variation__attribute_size.ibd
new file mode 100644
index 000000000..613ad815b
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__attribute_size.ibd differ
diff --git a/mariadb/mtshop/commerce_product_variation__field_image.frm b/mariadb/mtshop/commerce_product_variation__field_image.frm
new file mode 100644
index 000000000..be1a96153
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__field_image.frm differ
diff --git a/mariadb/mtshop/commerce_product_variation__field_image.ibd b/mariadb/mtshop/commerce_product_variation__field_image.ibd
new file mode 100644
index 000000000..6551f025d
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__field_image.ibd differ
diff --git a/mariadb/mtshop/commerce_product_variation__field_stock_level.frm b/mariadb/mtshop/commerce_product_variation__field_stock_level.frm
new file mode 100644
index 000000000..0424ec2d2
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__field_stock_level.frm differ
diff --git a/mariadb/mtshop/commerce_product_variation__field_stock_level.ibd b/mariadb/mtshop/commerce_product_variation__field_stock_level.ibd
new file mode 100644
index 000000000..b93300f47
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__field_stock_level.ibd differ
diff --git a/mariadb/mtshop/commerce_product_variation__weight.frm b/mariadb/mtshop/commerce_product_variation__weight.frm
new file mode 100644
index 000000000..655959247
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__weight.frm differ
diff --git a/mariadb/mtshop/commerce_product_variation__weight.ibd b/mariadb/mtshop/commerce_product_variation__weight.ibd
new file mode 100644
index 000000000..c29019ebd
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation__weight.ibd differ
diff --git a/mariadb/mtshop/commerce_product_variation_field_data.frm b/mariadb/mtshop/commerce_product_variation_field_data.frm
new file mode 100644
index 000000000..ecfb3aa03
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation_field_data.frm differ
diff --git a/mariadb/mtshop/commerce_product_variation_field_data.ibd b/mariadb/mtshop/commerce_product_variation_field_data.ibd
new file mode 100644
index 000000000..4e2e4de28
Binary files /dev/null and b/mariadb/mtshop/commerce_product_variation_field_data.ibd differ
diff --git a/mariadb/mtshop/commerce_promotion.frm b/mariadb/mtshop/commerce_promotion.frm
new file mode 100644
index 000000000..1cf5948d2
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion.frm differ
diff --git a/mariadb/mtshop/commerce_promotion.ibd b/mariadb/mtshop/commerce_promotion.ibd
new file mode 100644
index 000000000..c4f7dcd3d
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion.ibd differ
diff --git a/mariadb/mtshop/commerce_promotion__conditions.frm b/mariadb/mtshop/commerce_promotion__conditions.frm
new file mode 100644
index 000000000..9878d4837
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion__conditions.frm differ
diff --git a/mariadb/mtshop/commerce_promotion__conditions.ibd b/mariadb/mtshop/commerce_promotion__conditions.ibd
new file mode 100644
index 000000000..84be2384b
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion__conditions.ibd differ
diff --git a/mariadb/mtshop/commerce_promotion__coupons.frm b/mariadb/mtshop/commerce_promotion__coupons.frm
new file mode 100644
index 000000000..817ffd7f8
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion__coupons.frm differ
diff --git a/mariadb/mtshop/commerce_promotion__coupons.ibd b/mariadb/mtshop/commerce_promotion__coupons.ibd
new file mode 100644
index 000000000..1fc74c195
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion__coupons.ibd differ
diff --git a/mariadb/mtshop/commerce_promotion__order_types.frm b/mariadb/mtshop/commerce_promotion__order_types.frm
new file mode 100644
index 000000000..47ab0820f
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion__order_types.frm differ
diff --git a/mariadb/mtshop/commerce_promotion__order_types.ibd b/mariadb/mtshop/commerce_promotion__order_types.ibd
new file mode 100644
index 000000000..4e4a7525f
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion__order_types.ibd differ
diff --git a/mariadb/mtshop/commerce_promotion__stores.frm b/mariadb/mtshop/commerce_promotion__stores.frm
new file mode 100644
index 000000000..d4276b615
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion__stores.frm differ
diff --git a/mariadb/mtshop/commerce_promotion__stores.ibd b/mariadb/mtshop/commerce_promotion__stores.ibd
new file mode 100644
index 000000000..dbe2fe08c
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion__stores.ibd differ
diff --git a/mariadb/mtshop/commerce_promotion_coupon.frm b/mariadb/mtshop/commerce_promotion_coupon.frm
new file mode 100644
index 000000000..d216482a0
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion_coupon.frm differ
diff --git a/mariadb/mtshop/commerce_promotion_coupon.ibd b/mariadb/mtshop/commerce_promotion_coupon.ibd
new file mode 100644
index 000000000..7e3540fc9
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion_coupon.ibd differ
diff --git a/mariadb/mtshop/commerce_promotion_field_data.frm b/mariadb/mtshop/commerce_promotion_field_data.frm
new file mode 100644
index 000000000..623d24a0b
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion_field_data.frm differ
diff --git a/mariadb/mtshop/commerce_promotion_field_data.ibd b/mariadb/mtshop/commerce_promotion_field_data.ibd
new file mode 100644
index 000000000..e70c66b35
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion_field_data.ibd differ
diff --git a/mariadb/mtshop/commerce_promotion_usage.frm b/mariadb/mtshop/commerce_promotion_usage.frm
new file mode 100644
index 000000000..2bf2e85a9
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion_usage.frm differ
diff --git a/mariadb/mtshop/commerce_promotion_usage.ibd b/mariadb/mtshop/commerce_promotion_usage.ibd
new file mode 100644
index 000000000..3545e1173
Binary files /dev/null and b/mariadb/mtshop/commerce_promotion_usage.ibd differ
diff --git a/mariadb/mtshop/commerce_shipment.frm b/mariadb/mtshop/commerce_shipment.frm
new file mode 100644
index 000000000..03ed8228f
Binary files /dev/null and b/mariadb/mtshop/commerce_shipment.frm differ
diff --git a/mariadb/mtshop/commerce_shipment.ibd b/mariadb/mtshop/commerce_shipment.ibd
new file mode 100644
index 000000000..a9df377ac
Binary files /dev/null and b/mariadb/mtshop/commerce_shipment.ibd differ
diff --git a/mariadb/mtshop/commerce_shipment__adjustments.frm b/mariadb/mtshop/commerce_shipment__adjustments.frm
new file mode 100644
index 000000000..651854037
Binary files /dev/null and b/mariadb/mtshop/commerce_shipment__adjustments.frm differ
diff --git a/mariadb/mtshop/commerce_shipment__adjustments.ibd b/mariadb/mtshop/commerce_shipment__adjustments.ibd
new file mode 100644
index 000000000..7dd1d3df3
Binary files /dev/null and b/mariadb/mtshop/commerce_shipment__adjustments.ibd differ
diff --git a/mariadb/mtshop/commerce_shipment__items.frm b/mariadb/mtshop/commerce_shipment__items.frm
new file mode 100644
index 000000000..f32d2ee44
Binary files /dev/null and b/mariadb/mtshop/commerce_shipment__items.frm differ
diff --git a/mariadb/mtshop/commerce_shipment__items.ibd b/mariadb/mtshop/commerce_shipment__items.ibd
new file mode 100644
index 000000000..19dfb67ce
Binary files /dev/null and b/mariadb/mtshop/commerce_shipment__items.ibd differ
diff --git a/mariadb/mtshop/commerce_shipping_method.frm b/mariadb/mtshop/commerce_shipping_method.frm
new file mode 100644
index 000000000..10a5d135e
Binary files /dev/null and b/mariadb/mtshop/commerce_shipping_method.frm differ
diff --git a/mariadb/mtshop/commerce_shipping_method.ibd b/mariadb/mtshop/commerce_shipping_method.ibd
new file mode 100644
index 000000000..0627cc0b4
Binary files /dev/null and b/mariadb/mtshop/commerce_shipping_method.ibd differ
diff --git a/mariadb/mtshop/commerce_shipping_method__conditions.frm b/mariadb/mtshop/commerce_shipping_method__conditions.frm
new file mode 100644
index 000000000..a7cd3fd11
Binary files /dev/null and b/mariadb/mtshop/commerce_shipping_method__conditions.frm differ
diff --git a/mariadb/mtshop/commerce_shipping_method__conditions.ibd b/mariadb/mtshop/commerce_shipping_method__conditions.ibd
new file mode 100644
index 000000000..4c2098af0
Binary files /dev/null and b/mariadb/mtshop/commerce_shipping_method__conditions.ibd differ
diff --git a/mariadb/mtshop/commerce_shipping_method__stores.frm b/mariadb/mtshop/commerce_shipping_method__stores.frm
new file mode 100644
index 000000000..4f9c40e28
Binary files /dev/null and b/mariadb/mtshop/commerce_shipping_method__stores.frm differ
diff --git a/mariadb/mtshop/commerce_shipping_method__stores.ibd b/mariadb/mtshop/commerce_shipping_method__stores.ibd
new file mode 100644
index 000000000..ce7cf0cde
Binary files /dev/null and b/mariadb/mtshop/commerce_shipping_method__stores.ibd differ
diff --git a/mariadb/mtshop/commerce_shipping_method_field_data.frm b/mariadb/mtshop/commerce_shipping_method_field_data.frm
new file mode 100644
index 000000000..4d61af38d
Binary files /dev/null and b/mariadb/mtshop/commerce_shipping_method_field_data.frm differ
diff --git a/mariadb/mtshop/commerce_shipping_method_field_data.ibd b/mariadb/mtshop/commerce_shipping_method_field_data.ibd
new file mode 100644
index 000000000..da66657b0
Binary files /dev/null and b/mariadb/mtshop/commerce_shipping_method_field_data.ibd differ
diff --git a/mariadb/mtshop/commerce_stock_location.frm b/mariadb/mtshop/commerce_stock_location.frm
new file mode 100644
index 000000000..b16668a81
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_location.frm differ
diff --git a/mariadb/mtshop/commerce_stock_location.ibd b/mariadb/mtshop/commerce_stock_location.ibd
new file mode 100644
index 000000000..6217921bb
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_location.ibd differ
diff --git a/mariadb/mtshop/commerce_stock_location_field_data.frm b/mariadb/mtshop/commerce_stock_location_field_data.frm
new file mode 100644
index 000000000..48b4e980a
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_location_field_data.frm differ
diff --git a/mariadb/mtshop/commerce_stock_location_field_data.ibd b/mariadb/mtshop/commerce_stock_location_field_data.ibd
new file mode 100644
index 000000000..178e78693
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_location_field_data.ibd differ
diff --git a/mariadb/mtshop/commerce_stock_location_level.frm b/mariadb/mtshop/commerce_stock_location_level.frm
new file mode 100644
index 000000000..3d51b25e8
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_location_level.frm differ
diff --git a/mariadb/mtshop/commerce_stock_location_level.ibd b/mariadb/mtshop/commerce_stock_location_level.ibd
new file mode 100644
index 000000000..81d6bbabf
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_location_level.ibd differ
diff --git a/mariadb/mtshop/commerce_stock_transaction.frm b/mariadb/mtshop/commerce_stock_transaction.frm
new file mode 100644
index 000000000..34815a2fb
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_transaction.frm differ
diff --git a/mariadb/mtshop/commerce_stock_transaction.ibd b/mariadb/mtshop/commerce_stock_transaction.ibd
new file mode 100644
index 000000000..6a3d6e382
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_transaction.ibd differ
diff --git a/mariadb/mtshop/commerce_stock_transaction_type.frm b/mariadb/mtshop/commerce_stock_transaction_type.frm
new file mode 100644
index 000000000..6bc1650aa
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_transaction_type.frm differ
diff --git a/mariadb/mtshop/commerce_stock_transaction_type.ibd b/mariadb/mtshop/commerce_stock_transaction_type.ibd
new file mode 100644
index 000000000..646affd29
Binary files /dev/null and b/mariadb/mtshop/commerce_stock_transaction_type.ibd differ
diff --git a/mariadb/mtshop/commerce_store.frm b/mariadb/mtshop/commerce_store.frm
new file mode 100644
index 000000000..410e508c2
Binary files /dev/null and b/mariadb/mtshop/commerce_store.frm differ
diff --git a/mariadb/mtshop/commerce_store.ibd b/mariadb/mtshop/commerce_store.ibd
new file mode 100644
index 000000000..c8925148b
Binary files /dev/null and b/mariadb/mtshop/commerce_store.ibd differ
diff --git a/mariadb/mtshop/commerce_store__billing_countries.frm b/mariadb/mtshop/commerce_store__billing_countries.frm
new file mode 100644
index 000000000..64c562cc8
Binary files /dev/null and b/mariadb/mtshop/commerce_store__billing_countries.frm differ
diff --git a/mariadb/mtshop/commerce_store__billing_countries.ibd b/mariadb/mtshop/commerce_store__billing_countries.ibd
new file mode 100644
index 000000000..f7748fe5e
Binary files /dev/null and b/mariadb/mtshop/commerce_store__billing_countries.ibd differ
diff --git a/mariadb/mtshop/commerce_store__shipping_countries.frm b/mariadb/mtshop/commerce_store__shipping_countries.frm
new file mode 100644
index 000000000..5ef256b3e
Binary files /dev/null and b/mariadb/mtshop/commerce_store__shipping_countries.frm differ
diff --git a/mariadb/mtshop/commerce_store__shipping_countries.ibd b/mariadb/mtshop/commerce_store__shipping_countries.ibd
new file mode 100644
index 000000000..24a0aceb4
Binary files /dev/null and b/mariadb/mtshop/commerce_store__shipping_countries.ibd differ
diff --git a/mariadb/mtshop/commerce_store__tax_registrations.frm b/mariadb/mtshop/commerce_store__tax_registrations.frm
new file mode 100644
index 000000000..d5408f32a
Binary files /dev/null and b/mariadb/mtshop/commerce_store__tax_registrations.frm differ
diff --git a/mariadb/mtshop/commerce_store__tax_registrations.ibd b/mariadb/mtshop/commerce_store__tax_registrations.ibd
new file mode 100644
index 000000000..0e83b7dde
Binary files /dev/null and b/mariadb/mtshop/commerce_store__tax_registrations.ibd differ
diff --git a/mariadb/mtshop/commerce_store_field_data.frm b/mariadb/mtshop/commerce_store_field_data.frm
new file mode 100644
index 000000000..bb0e1a2be
Binary files /dev/null and b/mariadb/mtshop/commerce_store_field_data.frm differ
diff --git a/mariadb/mtshop/commerce_store_field_data.ibd b/mariadb/mtshop/commerce_store_field_data.ibd
new file mode 100644
index 000000000..c8cb33473
Binary files /dev/null and b/mariadb/mtshop/commerce_store_field_data.ibd differ
diff --git a/mariadb/mtshop/config.frm b/mariadb/mtshop/config.frm
new file mode 100644
index 000000000..e93b882a7
Binary files /dev/null and b/mariadb/mtshop/config.frm differ
diff --git a/mariadb/mtshop/config.ibd b/mariadb/mtshop/config.ibd
new file mode 100644
index 000000000..c77d8234e
Binary files /dev/null and b/mariadb/mtshop/config.ibd differ
diff --git a/mariadb/mtshop/config_export.frm b/mariadb/mtshop/config_export.frm
new file mode 100644
index 000000000..6fd21331c
Binary files /dev/null and b/mariadb/mtshop/config_export.frm differ
diff --git a/mariadb/mtshop/config_export.ibd b/mariadb/mtshop/config_export.ibd
new file mode 100644
index 000000000..233c2a0ee
Binary files /dev/null and b/mariadb/mtshop/config_export.ibd differ
diff --git a/mariadb/mtshop/config_import.frm b/mariadb/mtshop/config_import.frm
new file mode 100644
index 000000000..1d88d3f07
Binary files /dev/null and b/mariadb/mtshop/config_import.frm differ
diff --git a/mariadb/mtshop/config_import.ibd b/mariadb/mtshop/config_import.ibd
new file mode 100644
index 000000000..8272d6eb0
Binary files /dev/null and b/mariadb/mtshop/config_import.ibd differ
diff --git a/mariadb/mtshop/config_snapshot.frm b/mariadb/mtshop/config_snapshot.frm
new file mode 100644
index 000000000..abeeb5e3d
Binary files /dev/null and b/mariadb/mtshop/config_snapshot.frm differ
diff --git a/mariadb/mtshop/config_snapshot.ibd b/mariadb/mtshop/config_snapshot.ibd
new file mode 100644
index 000000000..8afece7f0
Binary files /dev/null and b/mariadb/mtshop/config_snapshot.ibd differ
diff --git a/mariadb/mtshop/db.opt b/mariadb/mtshop/db.opt
new file mode 100644
index 000000000..ccbf69992
--- /dev/null
+++ b/mariadb/mtshop/db.opt
@@ -0,0 +1,2 @@
+default-character-set=utf8mb4
+default-collation=utf8mb4_general_ci
diff --git a/mariadb/mtshop/file_managed.frm b/mariadb/mtshop/file_managed.frm
new file mode 100644
index 000000000..7b488bc70
Binary files /dev/null and b/mariadb/mtshop/file_managed.frm differ
diff --git a/mariadb/mtshop/file_managed.ibd b/mariadb/mtshop/file_managed.ibd
new file mode 100644
index 000000000..65ac84dca
Binary files /dev/null and b/mariadb/mtshop/file_managed.ibd differ
diff --git a/mariadb/mtshop/file_usage.frm b/mariadb/mtshop/file_usage.frm
new file mode 100644
index 000000000..15321e757
Binary files /dev/null and b/mariadb/mtshop/file_usage.frm differ
diff --git a/mariadb/mtshop/file_usage.ibd b/mariadb/mtshop/file_usage.ibd
new file mode 100644
index 000000000..b239398ff
Binary files /dev/null and b/mariadb/mtshop/file_usage.ibd differ
diff --git a/mariadb/mtshop/flag_counts.frm b/mariadb/mtshop/flag_counts.frm
new file mode 100644
index 000000000..7c513fb70
Binary files /dev/null and b/mariadb/mtshop/flag_counts.frm differ
diff --git a/mariadb/mtshop/flag_counts.ibd b/mariadb/mtshop/flag_counts.ibd
new file mode 100644
index 000000000..ba78b292e
Binary files /dev/null and b/mariadb/mtshop/flag_counts.ibd differ
diff --git a/mariadb/mtshop/flagging.frm b/mariadb/mtshop/flagging.frm
new file mode 100644
index 000000000..2a8eaef62
Binary files /dev/null and b/mariadb/mtshop/flagging.frm differ
diff --git a/mariadb/mtshop/flagging.ibd b/mariadb/mtshop/flagging.ibd
new file mode 100644
index 000000000..3193c2eb5
Binary files /dev/null and b/mariadb/mtshop/flagging.ibd differ
diff --git a/mariadb/mtshop/flood.frm b/mariadb/mtshop/flood.frm
new file mode 100644
index 000000000..39da7bba7
Binary files /dev/null and b/mariadb/mtshop/flood.frm differ
diff --git a/mariadb/mtshop/flood.ibd b/mariadb/mtshop/flood.ibd
new file mode 100644
index 000000000..8c094aabd
Binary files /dev/null and b/mariadb/mtshop/flood.ibd differ
diff --git a/mariadb/mtshop/history.frm b/mariadb/mtshop/history.frm
new file mode 100644
index 000000000..353031414
Binary files /dev/null and b/mariadb/mtshop/history.frm differ
diff --git a/mariadb/mtshop/history.ibd b/mariadb/mtshop/history.ibd
new file mode 100644
index 000000000..fd7cd727d
Binary files /dev/null and b/mariadb/mtshop/history.ibd differ
diff --git a/mariadb/mtshop/inline_block_usage.frm b/mariadb/mtshop/inline_block_usage.frm
new file mode 100644
index 000000000..fcba1d535
Binary files /dev/null and b/mariadb/mtshop/inline_block_usage.frm differ
diff --git a/mariadb/mtshop/inline_block_usage.ibd b/mariadb/mtshop/inline_block_usage.ibd
new file mode 100644
index 000000000..1afa2ab9e
Binary files /dev/null and b/mariadb/mtshop/inline_block_usage.ibd differ
diff --git a/mariadb/mtshop/key_value.frm b/mariadb/mtshop/key_value.frm
new file mode 100644
index 000000000..9525a0b33
Binary files /dev/null and b/mariadb/mtshop/key_value.frm differ
diff --git a/mariadb/mtshop/key_value.ibd b/mariadb/mtshop/key_value.ibd
new file mode 100644
index 000000000..53aa7d92a
Binary files /dev/null and b/mariadb/mtshop/key_value.ibd differ
diff --git a/mariadb/mtshop/key_value_expire.frm b/mariadb/mtshop/key_value_expire.frm
new file mode 100644
index 000000000..186902d7a
Binary files /dev/null and b/mariadb/mtshop/key_value_expire.frm differ
diff --git a/mariadb/mtshop/key_value_expire.ibd b/mariadb/mtshop/key_value_expire.ibd
new file mode 100644
index 000000000..3ffca14b5
Binary files /dev/null and b/mariadb/mtshop/key_value_expire.ibd differ
diff --git a/mariadb/mtshop/locale_file.frm b/mariadb/mtshop/locale_file.frm
new file mode 100644
index 000000000..683802a9b
Binary files /dev/null and b/mariadb/mtshop/locale_file.frm differ
diff --git a/mariadb/mtshop/locale_file.ibd b/mariadb/mtshop/locale_file.ibd
new file mode 100644
index 000000000..9e4779533
Binary files /dev/null and b/mariadb/mtshop/locale_file.ibd differ
diff --git a/mariadb/mtshop/locales_location.frm b/mariadb/mtshop/locales_location.frm
new file mode 100644
index 000000000..df0f0bfb5
Binary files /dev/null and b/mariadb/mtshop/locales_location.frm differ
diff --git a/mariadb/mtshop/locales_location.ibd b/mariadb/mtshop/locales_location.ibd
new file mode 100644
index 000000000..6c70a6ca6
Binary files /dev/null and b/mariadb/mtshop/locales_location.ibd differ
diff --git a/mariadb/mtshop/locales_source.frm b/mariadb/mtshop/locales_source.frm
new file mode 100644
index 000000000..ebbc53673
Binary files /dev/null and b/mariadb/mtshop/locales_source.frm differ
diff --git a/mariadb/mtshop/locales_source.ibd b/mariadb/mtshop/locales_source.ibd
new file mode 100644
index 000000000..c6e5fe598
Binary files /dev/null and b/mariadb/mtshop/locales_source.ibd differ
diff --git a/mariadb/mtshop/locales_target.frm b/mariadb/mtshop/locales_target.frm
new file mode 100644
index 000000000..d7fc0ccd1
Binary files /dev/null and b/mariadb/mtshop/locales_target.frm differ
diff --git a/mariadb/mtshop/locales_target.ibd b/mariadb/mtshop/locales_target.ibd
new file mode 100644
index 000000000..7b99635e0
Binary files /dev/null and b/mariadb/mtshop/locales_target.ibd differ
diff --git a/mariadb/mtshop/media.frm b/mariadb/mtshop/media.frm
new file mode 100644
index 000000000..1df827f69
Binary files /dev/null and b/mariadb/mtshop/media.frm differ
diff --git a/mariadb/mtshop/media.ibd b/mariadb/mtshop/media.ibd
new file mode 100644
index 000000000..25cffca63
Binary files /dev/null and b/mariadb/mtshop/media.ibd differ
diff --git a/mariadb/mtshop/media__field_media_audio_file.frm b/mariadb/mtshop/media__field_media_audio_file.frm
new file mode 100644
index 000000000..f516ced84
Binary files /dev/null and b/mariadb/mtshop/media__field_media_audio_file.frm differ
diff --git a/mariadb/mtshop/media__field_media_audio_file.ibd b/mariadb/mtshop/media__field_media_audio_file.ibd
new file mode 100644
index 000000000..eceae9c27
Binary files /dev/null and b/mariadb/mtshop/media__field_media_audio_file.ibd differ
diff --git a/mariadb/mtshop/media__field_media_document.frm b/mariadb/mtshop/media__field_media_document.frm
new file mode 100644
index 000000000..863bfd734
Binary files /dev/null and b/mariadb/mtshop/media__field_media_document.frm differ
diff --git a/mariadb/mtshop/media__field_media_document.ibd b/mariadb/mtshop/media__field_media_document.ibd
new file mode 100644
index 000000000..77d87849c
Binary files /dev/null and b/mariadb/mtshop/media__field_media_document.ibd differ
diff --git a/mariadb/mtshop/media__field_media_image.frm b/mariadb/mtshop/media__field_media_image.frm
new file mode 100644
index 000000000..1d2fcd460
Binary files /dev/null and b/mariadb/mtshop/media__field_media_image.frm differ
diff --git a/mariadb/mtshop/media__field_media_image.ibd b/mariadb/mtshop/media__field_media_image.ibd
new file mode 100644
index 000000000..73bdb7a4e
Binary files /dev/null and b/mariadb/mtshop/media__field_media_image.ibd differ
diff --git a/mariadb/mtshop/media__field_media_oembed_video.frm b/mariadb/mtshop/media__field_media_oembed_video.frm
new file mode 100644
index 000000000..86f48afc0
Binary files /dev/null and b/mariadb/mtshop/media__field_media_oembed_video.frm differ
diff --git a/mariadb/mtshop/media__field_media_oembed_video.ibd b/mariadb/mtshop/media__field_media_oembed_video.ibd
new file mode 100644
index 000000000..d02120f2a
Binary files /dev/null and b/mariadb/mtshop/media__field_media_oembed_video.ibd differ
diff --git a/mariadb/mtshop/media__field_media_video_file.frm b/mariadb/mtshop/media__field_media_video_file.frm
new file mode 100644
index 000000000..6757bb104
Binary files /dev/null and b/mariadb/mtshop/media__field_media_video_file.frm differ
diff --git a/mariadb/mtshop/media__field_media_video_file.ibd b/mariadb/mtshop/media__field_media_video_file.ibd
new file mode 100644
index 000000000..7567acb75
Binary files /dev/null and b/mariadb/mtshop/media__field_media_video_file.ibd differ
diff --git a/mariadb/mtshop/media_field_data.frm b/mariadb/mtshop/media_field_data.frm
new file mode 100644
index 000000000..59effbdba
Binary files /dev/null and b/mariadb/mtshop/media_field_data.frm differ
diff --git a/mariadb/mtshop/media_field_data.ibd b/mariadb/mtshop/media_field_data.ibd
new file mode 100644
index 000000000..ed447e4ec
Binary files /dev/null and b/mariadb/mtshop/media_field_data.ibd differ
diff --git a/mariadb/mtshop/media_field_revision.frm b/mariadb/mtshop/media_field_revision.frm
new file mode 100644
index 000000000..81f103a6c
Binary files /dev/null and b/mariadb/mtshop/media_field_revision.frm differ
diff --git a/mariadb/mtshop/media_field_revision.ibd b/mariadb/mtshop/media_field_revision.ibd
new file mode 100644
index 000000000..ba035d89c
Binary files /dev/null and b/mariadb/mtshop/media_field_revision.ibd differ
diff --git a/mariadb/mtshop/media_revision.frm b/mariadb/mtshop/media_revision.frm
new file mode 100644
index 000000000..7f80a0fe2
Binary files /dev/null and b/mariadb/mtshop/media_revision.frm differ
diff --git a/mariadb/mtshop/media_revision.ibd b/mariadb/mtshop/media_revision.ibd
new file mode 100644
index 000000000..9f8d53b35
Binary files /dev/null and b/mariadb/mtshop/media_revision.ibd differ
diff --git a/mariadb/mtshop/media_revision__field_media_audio_file.frm b/mariadb/mtshop/media_revision__field_media_audio_file.frm
new file mode 100644
index 000000000..b72d7a3ab
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_audio_file.frm differ
diff --git a/mariadb/mtshop/media_revision__field_media_audio_file.ibd b/mariadb/mtshop/media_revision__field_media_audio_file.ibd
new file mode 100644
index 000000000..0cc96aa72
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_audio_file.ibd differ
diff --git a/mariadb/mtshop/media_revision__field_media_document.frm b/mariadb/mtshop/media_revision__field_media_document.frm
new file mode 100644
index 000000000..4e7c9e3c2
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_document.frm differ
diff --git a/mariadb/mtshop/media_revision__field_media_document.ibd b/mariadb/mtshop/media_revision__field_media_document.ibd
new file mode 100644
index 000000000..2aebe7bb9
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_document.ibd differ
diff --git a/mariadb/mtshop/media_revision__field_media_image.frm b/mariadb/mtshop/media_revision__field_media_image.frm
new file mode 100644
index 000000000..639f7dbc2
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_image.frm differ
diff --git a/mariadb/mtshop/media_revision__field_media_image.ibd b/mariadb/mtshop/media_revision__field_media_image.ibd
new file mode 100644
index 000000000..8799290d5
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_image.ibd differ
diff --git a/mariadb/mtshop/media_revision__field_media_oembed_video.frm b/mariadb/mtshop/media_revision__field_media_oembed_video.frm
new file mode 100644
index 000000000..41664a088
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_oembed_video.frm differ
diff --git a/mariadb/mtshop/media_revision__field_media_oembed_video.ibd b/mariadb/mtshop/media_revision__field_media_oembed_video.ibd
new file mode 100644
index 000000000..ce6417421
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_oembed_video.ibd differ
diff --git a/mariadb/mtshop/media_revision__field_media_video_file.frm b/mariadb/mtshop/media_revision__field_media_video_file.frm
new file mode 100644
index 000000000..91b35753c
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_video_file.frm differ
diff --git a/mariadb/mtshop/media_revision__field_media_video_file.ibd b/mariadb/mtshop/media_revision__field_media_video_file.ibd
new file mode 100644
index 000000000..aaac86b7d
Binary files /dev/null and b/mariadb/mtshop/media_revision__field_media_video_file.ibd differ
diff --git a/mariadb/mtshop/menu_link_content.frm b/mariadb/mtshop/menu_link_content.frm
new file mode 100644
index 000000000..69d112b85
Binary files /dev/null and b/mariadb/mtshop/menu_link_content.frm differ
diff --git a/mariadb/mtshop/menu_link_content.ibd b/mariadb/mtshop/menu_link_content.ibd
new file mode 100644
index 000000000..2e6c44c78
Binary files /dev/null and b/mariadb/mtshop/menu_link_content.ibd differ
diff --git a/mariadb/mtshop/menu_link_content_data.frm b/mariadb/mtshop/menu_link_content_data.frm
new file mode 100644
index 000000000..d394a7ba3
Binary files /dev/null and b/mariadb/mtshop/menu_link_content_data.frm differ
diff --git a/mariadb/mtshop/menu_link_content_data.ibd b/mariadb/mtshop/menu_link_content_data.ibd
new file mode 100644
index 000000000..b59259853
Binary files /dev/null and b/mariadb/mtshop/menu_link_content_data.ibd differ
diff --git a/mariadb/mtshop/menu_link_content_field_revision.frm b/mariadb/mtshop/menu_link_content_field_revision.frm
new file mode 100644
index 000000000..5e716c011
Binary files /dev/null and b/mariadb/mtshop/menu_link_content_field_revision.frm differ
diff --git a/mariadb/mtshop/menu_link_content_field_revision.ibd b/mariadb/mtshop/menu_link_content_field_revision.ibd
new file mode 100644
index 000000000..d057ae227
Binary files /dev/null and b/mariadb/mtshop/menu_link_content_field_revision.ibd differ
diff --git a/mariadb/mtshop/menu_link_content_revision.frm b/mariadb/mtshop/menu_link_content_revision.frm
new file mode 100644
index 000000000..f84e8154d
Binary files /dev/null and b/mariadb/mtshop/menu_link_content_revision.frm differ
diff --git a/mariadb/mtshop/menu_link_content_revision.ibd b/mariadb/mtshop/menu_link_content_revision.ibd
new file mode 100644
index 000000000..ae2529bfc
Binary files /dev/null and b/mariadb/mtshop/menu_link_content_revision.ibd differ
diff --git a/mariadb/mtshop/menu_tree.frm b/mariadb/mtshop/menu_tree.frm
new file mode 100644
index 000000000..6e996f203
Binary files /dev/null and b/mariadb/mtshop/menu_tree.frm differ
diff --git a/mariadb/mtshop/menu_tree.ibd b/mariadb/mtshop/menu_tree.ibd
new file mode 100644
index 000000000..419143f1d
Binary files /dev/null and b/mariadb/mtshop/menu_tree.ibd differ
diff --git a/mariadb/mtshop/node.frm b/mariadb/mtshop/node.frm
new file mode 100644
index 000000000..494afdadb
Binary files /dev/null and b/mariadb/mtshop/node.frm differ
diff --git a/mariadb/mtshop/node.ibd b/mariadb/mtshop/node.ibd
new file mode 100644
index 000000000..d3e58d281
Binary files /dev/null and b/mariadb/mtshop/node.ibd differ
diff --git a/mariadb/mtshop/node__body.frm b/mariadb/mtshop/node__body.frm
new file mode 100644
index 000000000..00f2c58b7
Binary files /dev/null and b/mariadb/mtshop/node__body.frm differ
diff --git a/mariadb/mtshop/node__body.ibd b/mariadb/mtshop/node__body.ibd
new file mode 100644
index 000000000..b4033c658
Binary files /dev/null and b/mariadb/mtshop/node__body.ibd differ
diff --git a/mariadb/mtshop/node__comment.frm b/mariadb/mtshop/node__comment.frm
new file mode 100644
index 000000000..10177962a
Binary files /dev/null and b/mariadb/mtshop/node__comment.frm differ
diff --git a/mariadb/mtshop/node__comment.ibd b/mariadb/mtshop/node__comment.ibd
new file mode 100644
index 000000000..8f90cd753
Binary files /dev/null and b/mariadb/mtshop/node__comment.ibd differ
diff --git a/mariadb/mtshop/node__field_blog_format.frm b/mariadb/mtshop/node__field_blog_format.frm
new file mode 100644
index 000000000..010eb5a7c
Binary files /dev/null and b/mariadb/mtshop/node__field_blog_format.frm differ
diff --git a/mariadb/mtshop/node__field_blog_format.ibd b/mariadb/mtshop/node__field_blog_format.ibd
new file mode 100644
index 000000000..ea98ffa24
Binary files /dev/null and b/mariadb/mtshop/node__field_blog_format.ibd differ
diff --git a/mariadb/mtshop/node__field_category.frm b/mariadb/mtshop/node__field_category.frm
new file mode 100644
index 000000000..2469ae71f
Binary files /dev/null and b/mariadb/mtshop/node__field_category.frm differ
diff --git a/mariadb/mtshop/node__field_category.ibd b/mariadb/mtshop/node__field_category.ibd
new file mode 100644
index 000000000..e88212583
Binary files /dev/null and b/mariadb/mtshop/node__field_category.ibd differ
diff --git a/mariadb/mtshop/node__field_client.frm b/mariadb/mtshop/node__field_client.frm
new file mode 100644
index 000000000..0382dd11d
Binary files /dev/null and b/mariadb/mtshop/node__field_client.frm differ
diff --git a/mariadb/mtshop/node__field_client.ibd b/mariadb/mtshop/node__field_client.ibd
new file mode 100644
index 000000000..5ebee548d
Binary files /dev/null and b/mariadb/mtshop/node__field_client.ibd differ
diff --git a/mariadb/mtshop/node__field_content_placement.frm b/mariadb/mtshop/node__field_content_placement.frm
new file mode 100644
index 000000000..990e29c44
Binary files /dev/null and b/mariadb/mtshop/node__field_content_placement.frm differ
diff --git a/mariadb/mtshop/node__field_content_placement.ibd b/mariadb/mtshop/node__field_content_placement.ibd
new file mode 100644
index 000000000..c80a44a84
Binary files /dev/null and b/mariadb/mtshop/node__field_content_placement.ibd differ
diff --git a/mariadb/mtshop/node__field_facebook_link.frm b/mariadb/mtshop/node__field_facebook_link.frm
new file mode 100644
index 000000000..8ec9f2239
Binary files /dev/null and b/mariadb/mtshop/node__field_facebook_link.frm differ
diff --git a/mariadb/mtshop/node__field_facebook_link.ibd b/mariadb/mtshop/node__field_facebook_link.ibd
new file mode 100644
index 000000000..5d70cf099
Binary files /dev/null and b/mariadb/mtshop/node__field_facebook_link.ibd differ
diff --git a/mariadb/mtshop/node__field_heading_text.frm b/mariadb/mtshop/node__field_heading_text.frm
new file mode 100644
index 000000000..5176cd1ef
Binary files /dev/null and b/mariadb/mtshop/node__field_heading_text.frm differ
diff --git a/mariadb/mtshop/node__field_heading_text.ibd b/mariadb/mtshop/node__field_heading_text.ibd
new file mode 100644
index 000000000..e27b485fb
Binary files /dev/null and b/mariadb/mtshop/node__field_heading_text.ibd differ
diff --git a/mariadb/mtshop/node__field_icon.frm b/mariadb/mtshop/node__field_icon.frm
new file mode 100644
index 000000000..8441cc8ec
Binary files /dev/null and b/mariadb/mtshop/node__field_icon.frm differ
diff --git a/mariadb/mtshop/node__field_icon.ibd b/mariadb/mtshop/node__field_icon.ibd
new file mode 100644
index 000000000..ac51fa0ad
Binary files /dev/null and b/mariadb/mtshop/node__field_icon.ibd differ
diff --git a/mariadb/mtshop/node__field_icon_image.frm b/mariadb/mtshop/node__field_icon_image.frm
new file mode 100644
index 000000000..cc8ff0a8a
Binary files /dev/null and b/mariadb/mtshop/node__field_icon_image.frm differ
diff --git a/mariadb/mtshop/node__field_icon_image.ibd b/mariadb/mtshop/node__field_icon_image.ibd
new file mode 100644
index 000000000..dfe006f60
Binary files /dev/null and b/mariadb/mtshop/node__field_icon_image.ibd differ
diff --git a/mariadb/mtshop/node__field_image.frm b/mariadb/mtshop/node__field_image.frm
new file mode 100644
index 000000000..fcbfb452c
Binary files /dev/null and b/mariadb/mtshop/node__field_image.frm differ
diff --git a/mariadb/mtshop/node__field_image.ibd b/mariadb/mtshop/node__field_image.ibd
new file mode 100644
index 000000000..cd236e04d
Binary files /dev/null and b/mariadb/mtshop/node__field_image.ibd differ
diff --git a/mariadb/mtshop/node__field_link.frm b/mariadb/mtshop/node__field_link.frm
new file mode 100644
index 000000000..1ddeb32b4
Binary files /dev/null and b/mariadb/mtshop/node__field_link.frm differ
diff --git a/mariadb/mtshop/node__field_link.ibd b/mariadb/mtshop/node__field_link.ibd
new file mode 100644
index 000000000..bf88dc219
Binary files /dev/null and b/mariadb/mtshop/node__field_link.ibd differ
diff --git a/mariadb/mtshop/node__field_linkedin_link.frm b/mariadb/mtshop/node__field_linkedin_link.frm
new file mode 100644
index 000000000..6c0e6c859
Binary files /dev/null and b/mariadb/mtshop/node__field_linkedin_link.frm differ
diff --git a/mariadb/mtshop/node__field_linkedin_link.ibd b/mariadb/mtshop/node__field_linkedin_link.ibd
new file mode 100644
index 000000000..33270da4f
Binary files /dev/null and b/mariadb/mtshop/node__field_linkedin_link.ibd differ
diff --git a/mariadb/mtshop/node__field_make_content_link.frm b/mariadb/mtshop/node__field_make_content_link.frm
new file mode 100644
index 000000000..fc43a7b60
Binary files /dev/null and b/mariadb/mtshop/node__field_make_content_link.frm differ
diff --git a/mariadb/mtshop/node__field_make_content_link.ibd b/mariadb/mtshop/node__field_make_content_link.ibd
new file mode 100644
index 000000000..c126b09ab
Binary files /dev/null and b/mariadb/mtshop/node__field_make_content_link.ibd differ
diff --git a/mariadb/mtshop/node__field_portfolio_format.frm b/mariadb/mtshop/node__field_portfolio_format.frm
new file mode 100644
index 000000000..312d266e9
Binary files /dev/null and b/mariadb/mtshop/node__field_portfolio_format.frm differ
diff --git a/mariadb/mtshop/node__field_portfolio_format.ibd b/mariadb/mtshop/node__field_portfolio_format.ibd
new file mode 100644
index 000000000..1d6050066
Binary files /dev/null and b/mariadb/mtshop/node__field_portfolio_format.ibd differ
diff --git a/mariadb/mtshop/node__field_position.frm b/mariadb/mtshop/node__field_position.frm
new file mode 100644
index 000000000..3f796f2cf
Binary files /dev/null and b/mariadb/mtshop/node__field_position.frm differ
diff --git a/mariadb/mtshop/node__field_position.ibd b/mariadb/mtshop/node__field_position.ibd
new file mode 100644
index 000000000..94af32d63
Binary files /dev/null and b/mariadb/mtshop/node__field_position.ibd differ
diff --git a/mariadb/mtshop/node__field_pre_heading_text.frm b/mariadb/mtshop/node__field_pre_heading_text.frm
new file mode 100644
index 000000000..557fb1664
Binary files /dev/null and b/mariadb/mtshop/node__field_pre_heading_text.frm differ
diff --git a/mariadb/mtshop/node__field_pre_heading_text.ibd b/mariadb/mtshop/node__field_pre_heading_text.ibd
new file mode 100644
index 000000000..40b0b9da7
Binary files /dev/null and b/mariadb/mtshop/node__field_pre_heading_text.ibd differ
diff --git a/mariadb/mtshop/node__field_pricing_currency.frm b/mariadb/mtshop/node__field_pricing_currency.frm
new file mode 100644
index 000000000..e5ac0b9ae
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_currency.frm differ
diff --git a/mariadb/mtshop/node__field_pricing_currency.ibd b/mariadb/mtshop/node__field_pricing_currency.ibd
new file mode 100644
index 000000000..737b03c39
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_currency.ibd differ
diff --git a/mariadb/mtshop/node__field_pricing_duration.frm b/mariadb/mtshop/node__field_pricing_duration.frm
new file mode 100644
index 000000000..0483c5397
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_duration.frm differ
diff --git a/mariadb/mtshop/node__field_pricing_duration.ibd b/mariadb/mtshop/node__field_pricing_duration.ibd
new file mode 100644
index 000000000..31232fedf
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_duration.ibd differ
diff --git a/mariadb/mtshop/node__field_pricing_feature.frm b/mariadb/mtshop/node__field_pricing_feature.frm
new file mode 100644
index 000000000..c380925b4
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_feature.frm differ
diff --git a/mariadb/mtshop/node__field_pricing_feature.ibd b/mariadb/mtshop/node__field_pricing_feature.ibd
new file mode 100644
index 000000000..7cc86e49b
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_feature.ibd differ
diff --git a/mariadb/mtshop/node__field_pricing_price.frm b/mariadb/mtshop/node__field_pricing_price.frm
new file mode 100644
index 000000000..c429ca2f0
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_price.frm differ
diff --git a/mariadb/mtshop/node__field_pricing_price.ibd b/mariadb/mtshop/node__field_pricing_price.ibd
new file mode 100644
index 000000000..185ea5436
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_price.ibd differ
diff --git a/mariadb/mtshop/node__field_pricing_table_type.frm b/mariadb/mtshop/node__field_pricing_table_type.frm
new file mode 100644
index 000000000..6bd109d9a
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_table_type.frm differ
diff --git a/mariadb/mtshop/node__field_pricing_table_type.ibd b/mariadb/mtshop/node__field_pricing_table_type.ibd
new file mode 100644
index 000000000..82fd8aab5
Binary files /dev/null and b/mariadb/mtshop/node__field_pricing_table_type.ibd differ
diff --git a/mariadb/mtshop/node__field_project_category.frm b/mariadb/mtshop/node__field_project_category.frm
new file mode 100644
index 000000000..d79c21fab
Binary files /dev/null and b/mariadb/mtshop/node__field_project_category.frm differ
diff --git a/mariadb/mtshop/node__field_project_category.ibd b/mariadb/mtshop/node__field_project_category.ibd
new file mode 100644
index 000000000..849368837
Binary files /dev/null and b/mariadb/mtshop/node__field_project_category.ibd differ
diff --git a/mariadb/mtshop/node__field_tags.frm b/mariadb/mtshop/node__field_tags.frm
new file mode 100644
index 000000000..5f822a4b7
Binary files /dev/null and b/mariadb/mtshop/node__field_tags.frm differ
diff --git a/mariadb/mtshop/node__field_tags.ibd b/mariadb/mtshop/node__field_tags.ibd
new file mode 100644
index 000000000..dd41f2b04
Binary files /dev/null and b/mariadb/mtshop/node__field_tags.ibd differ
diff --git a/mariadb/mtshop/node__field_text_align.frm b/mariadb/mtshop/node__field_text_align.frm
new file mode 100644
index 000000000..9852c236a
Binary files /dev/null and b/mariadb/mtshop/node__field_text_align.frm differ
diff --git a/mariadb/mtshop/node__field_text_align.ibd b/mariadb/mtshop/node__field_text_align.ibd
new file mode 100644
index 000000000..f88ad2f6f
Binary files /dev/null and b/mariadb/mtshop/node__field_text_align.ibd differ
diff --git a/mariadb/mtshop/node__field_text_color.frm b/mariadb/mtshop/node__field_text_color.frm
new file mode 100644
index 000000000..22724dc4a
Binary files /dev/null and b/mariadb/mtshop/node__field_text_color.frm differ
diff --git a/mariadb/mtshop/node__field_text_color.ibd b/mariadb/mtshop/node__field_text_color.ibd
new file mode 100644
index 000000000..d7129a327
Binary files /dev/null and b/mariadb/mtshop/node__field_text_color.ibd differ
diff --git a/mariadb/mtshop/node__field_twitter_link.frm b/mariadb/mtshop/node__field_twitter_link.frm
new file mode 100644
index 000000000..a1547c150
Binary files /dev/null and b/mariadb/mtshop/node__field_twitter_link.frm differ
diff --git a/mariadb/mtshop/node__field_twitter_link.ibd b/mariadb/mtshop/node__field_twitter_link.ibd
new file mode 100644
index 000000000..198faf905
Binary files /dev/null and b/mariadb/mtshop/node__field_twitter_link.ibd differ
diff --git a/mariadb/mtshop/node__field_video.frm b/mariadb/mtshop/node__field_video.frm
new file mode 100644
index 000000000..fc3b801e4
Binary files /dev/null and b/mariadb/mtshop/node__field_video.frm differ
diff --git a/mariadb/mtshop/node__field_video.ibd b/mariadb/mtshop/node__field_video.ibd
new file mode 100644
index 000000000..686752d75
Binary files /dev/null and b/mariadb/mtshop/node__field_video.ibd differ
diff --git a/mariadb/mtshop/node__simplenews_issue.frm b/mariadb/mtshop/node__simplenews_issue.frm
new file mode 100644
index 000000000..f30077ba0
Binary files /dev/null and b/mariadb/mtshop/node__simplenews_issue.frm differ
diff --git a/mariadb/mtshop/node__simplenews_issue.ibd b/mariadb/mtshop/node__simplenews_issue.ibd
new file mode 100644
index 000000000..0ddd6432b
Binary files /dev/null and b/mariadb/mtshop/node__simplenews_issue.ibd differ
diff --git a/mariadb/mtshop/node_access.frm b/mariadb/mtshop/node_access.frm
new file mode 100644
index 000000000..0508f155c
Binary files /dev/null and b/mariadb/mtshop/node_access.frm differ
diff --git a/mariadb/mtshop/node_access.ibd b/mariadb/mtshop/node_access.ibd
new file mode 100644
index 000000000..2ca68af14
Binary files /dev/null and b/mariadb/mtshop/node_access.ibd differ
diff --git a/mariadb/mtshop/node_counter.frm b/mariadb/mtshop/node_counter.frm
new file mode 100644
index 000000000..cdfe7e8b0
Binary files /dev/null and b/mariadb/mtshop/node_counter.frm differ
diff --git a/mariadb/mtshop/node_counter.ibd b/mariadb/mtshop/node_counter.ibd
new file mode 100644
index 000000000..1988500eb
Binary files /dev/null and b/mariadb/mtshop/node_counter.ibd differ
diff --git a/mariadb/mtshop/node_field_data.frm b/mariadb/mtshop/node_field_data.frm
new file mode 100644
index 000000000..50c6a1807
Binary files /dev/null and b/mariadb/mtshop/node_field_data.frm differ
diff --git a/mariadb/mtshop/node_field_data.ibd b/mariadb/mtshop/node_field_data.ibd
new file mode 100644
index 000000000..c999c0f79
Binary files /dev/null and b/mariadb/mtshop/node_field_data.ibd differ
diff --git a/mariadb/mtshop/node_field_revision.frm b/mariadb/mtshop/node_field_revision.frm
new file mode 100644
index 000000000..2b869f71c
Binary files /dev/null and b/mariadb/mtshop/node_field_revision.frm differ
diff --git a/mariadb/mtshop/node_field_revision.ibd b/mariadb/mtshop/node_field_revision.ibd
new file mode 100644
index 000000000..c10fa4ed1
Binary files /dev/null and b/mariadb/mtshop/node_field_revision.ibd differ
diff --git a/mariadb/mtshop/node_revision.frm b/mariadb/mtshop/node_revision.frm
new file mode 100644
index 000000000..5ab6e43c1
Binary files /dev/null and b/mariadb/mtshop/node_revision.frm differ
diff --git a/mariadb/mtshop/node_revision.ibd b/mariadb/mtshop/node_revision.ibd
new file mode 100644
index 000000000..8c93ee3dc
Binary files /dev/null and b/mariadb/mtshop/node_revision.ibd differ
diff --git a/mariadb/mtshop/node_revision__body.frm b/mariadb/mtshop/node_revision__body.frm
new file mode 100644
index 000000000..92c537a78
Binary files /dev/null and b/mariadb/mtshop/node_revision__body.frm differ
diff --git a/mariadb/mtshop/node_revision__body.ibd b/mariadb/mtshop/node_revision__body.ibd
new file mode 100644
index 000000000..e2265003c
Binary files /dev/null and b/mariadb/mtshop/node_revision__body.ibd differ
diff --git a/mariadb/mtshop/node_revision__comment.frm b/mariadb/mtshop/node_revision__comment.frm
new file mode 100644
index 000000000..4cc9b4942
Binary files /dev/null and b/mariadb/mtshop/node_revision__comment.frm differ
diff --git a/mariadb/mtshop/node_revision__comment.ibd b/mariadb/mtshop/node_revision__comment.ibd
new file mode 100644
index 000000000..5367efc00
Binary files /dev/null and b/mariadb/mtshop/node_revision__comment.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_blog_format.frm b/mariadb/mtshop/node_revision__field_blog_format.frm
new file mode 100644
index 000000000..981cab1ff
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_blog_format.frm differ
diff --git a/mariadb/mtshop/node_revision__field_blog_format.ibd b/mariadb/mtshop/node_revision__field_blog_format.ibd
new file mode 100644
index 000000000..83c2b7ec2
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_blog_format.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_category.frm b/mariadb/mtshop/node_revision__field_category.frm
new file mode 100644
index 000000000..fef67aaa6
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_category.frm differ
diff --git a/mariadb/mtshop/node_revision__field_category.ibd b/mariadb/mtshop/node_revision__field_category.ibd
new file mode 100644
index 000000000..96eeafe38
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_category.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_client.frm b/mariadb/mtshop/node_revision__field_client.frm
new file mode 100644
index 000000000..8dd906408
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_client.frm differ
diff --git a/mariadb/mtshop/node_revision__field_client.ibd b/mariadb/mtshop/node_revision__field_client.ibd
new file mode 100644
index 000000000..bbca51499
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_client.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_content_placement.frm b/mariadb/mtshop/node_revision__field_content_placement.frm
new file mode 100644
index 000000000..6486f444f
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_content_placement.frm differ
diff --git a/mariadb/mtshop/node_revision__field_content_placement.ibd b/mariadb/mtshop/node_revision__field_content_placement.ibd
new file mode 100644
index 000000000..30c79ec0d
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_content_placement.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_facebook_link.frm b/mariadb/mtshop/node_revision__field_facebook_link.frm
new file mode 100644
index 000000000..5b711019b
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_facebook_link.frm differ
diff --git a/mariadb/mtshop/node_revision__field_facebook_link.ibd b/mariadb/mtshop/node_revision__field_facebook_link.ibd
new file mode 100644
index 000000000..451541a63
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_facebook_link.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_heading_text.frm b/mariadb/mtshop/node_revision__field_heading_text.frm
new file mode 100644
index 000000000..b8eb69bc1
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_heading_text.frm differ
diff --git a/mariadb/mtshop/node_revision__field_heading_text.ibd b/mariadb/mtshop/node_revision__field_heading_text.ibd
new file mode 100644
index 000000000..9f9b955d5
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_heading_text.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_icon.frm b/mariadb/mtshop/node_revision__field_icon.frm
new file mode 100644
index 000000000..86c5fc5fb
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_icon.frm differ
diff --git a/mariadb/mtshop/node_revision__field_icon.ibd b/mariadb/mtshop/node_revision__field_icon.ibd
new file mode 100644
index 000000000..9fb66295a
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_icon.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_icon_image.frm b/mariadb/mtshop/node_revision__field_icon_image.frm
new file mode 100644
index 000000000..3aac29465
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_icon_image.frm differ
diff --git a/mariadb/mtshop/node_revision__field_icon_image.ibd b/mariadb/mtshop/node_revision__field_icon_image.ibd
new file mode 100644
index 000000000..ebe08982e
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_icon_image.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_image.frm b/mariadb/mtshop/node_revision__field_image.frm
new file mode 100644
index 000000000..f74e01001
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_image.frm differ
diff --git a/mariadb/mtshop/node_revision__field_image.ibd b/mariadb/mtshop/node_revision__field_image.ibd
new file mode 100644
index 000000000..3e54ea1e8
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_image.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_link.frm b/mariadb/mtshop/node_revision__field_link.frm
new file mode 100644
index 000000000..d7c705c2e
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_link.frm differ
diff --git a/mariadb/mtshop/node_revision__field_link.ibd b/mariadb/mtshop/node_revision__field_link.ibd
new file mode 100644
index 000000000..6a62c2baa
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_link.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_linkedin_link.frm b/mariadb/mtshop/node_revision__field_linkedin_link.frm
new file mode 100644
index 000000000..46839dbbe
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_linkedin_link.frm differ
diff --git a/mariadb/mtshop/node_revision__field_linkedin_link.ibd b/mariadb/mtshop/node_revision__field_linkedin_link.ibd
new file mode 100644
index 000000000..0c3690af8
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_linkedin_link.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_make_content_link.frm b/mariadb/mtshop/node_revision__field_make_content_link.frm
new file mode 100644
index 000000000..78a0568ea
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_make_content_link.frm differ
diff --git a/mariadb/mtshop/node_revision__field_make_content_link.ibd b/mariadb/mtshop/node_revision__field_make_content_link.ibd
new file mode 100644
index 000000000..3d6b8f2a5
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_make_content_link.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_portfolio_format.frm b/mariadb/mtshop/node_revision__field_portfolio_format.frm
new file mode 100644
index 000000000..75160109b
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_portfolio_format.frm differ
diff --git a/mariadb/mtshop/node_revision__field_portfolio_format.ibd b/mariadb/mtshop/node_revision__field_portfolio_format.ibd
new file mode 100644
index 000000000..966c489ef
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_portfolio_format.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_position.frm b/mariadb/mtshop/node_revision__field_position.frm
new file mode 100644
index 000000000..cd9011f37
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_position.frm differ
diff --git a/mariadb/mtshop/node_revision__field_position.ibd b/mariadb/mtshop/node_revision__field_position.ibd
new file mode 100644
index 000000000..916b96e6c
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_position.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_pre_heading_text.frm b/mariadb/mtshop/node_revision__field_pre_heading_text.frm
new file mode 100644
index 000000000..6caa7bf2e
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pre_heading_text.frm differ
diff --git a/mariadb/mtshop/node_revision__field_pre_heading_text.ibd b/mariadb/mtshop/node_revision__field_pre_heading_text.ibd
new file mode 100644
index 000000000..1638ae96d
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pre_heading_text.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_currency.frm b/mariadb/mtshop/node_revision__field_pricing_currency.frm
new file mode 100644
index 000000000..973a71c6d
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_currency.frm differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_currency.ibd b/mariadb/mtshop/node_revision__field_pricing_currency.ibd
new file mode 100644
index 000000000..730308a7f
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_currency.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_duration.frm b/mariadb/mtshop/node_revision__field_pricing_duration.frm
new file mode 100644
index 000000000..7f8f7a094
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_duration.frm differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_duration.ibd b/mariadb/mtshop/node_revision__field_pricing_duration.ibd
new file mode 100644
index 000000000..754e21999
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_duration.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_feature.frm b/mariadb/mtshop/node_revision__field_pricing_feature.frm
new file mode 100644
index 000000000..f031ee3f3
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_feature.frm differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_feature.ibd b/mariadb/mtshop/node_revision__field_pricing_feature.ibd
new file mode 100644
index 000000000..1d18e5446
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_feature.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_price.frm b/mariadb/mtshop/node_revision__field_pricing_price.frm
new file mode 100644
index 000000000..4fb9fae57
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_price.frm differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_price.ibd b/mariadb/mtshop/node_revision__field_pricing_price.ibd
new file mode 100644
index 000000000..4962651e3
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_price.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_table_type.frm b/mariadb/mtshop/node_revision__field_pricing_table_type.frm
new file mode 100644
index 000000000..913e935a7
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_table_type.frm differ
diff --git a/mariadb/mtshop/node_revision__field_pricing_table_type.ibd b/mariadb/mtshop/node_revision__field_pricing_table_type.ibd
new file mode 100644
index 000000000..9160f2d1c
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_pricing_table_type.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_project_category.frm b/mariadb/mtshop/node_revision__field_project_category.frm
new file mode 100644
index 000000000..c1a4b1a62
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_project_category.frm differ
diff --git a/mariadb/mtshop/node_revision__field_project_category.ibd b/mariadb/mtshop/node_revision__field_project_category.ibd
new file mode 100644
index 000000000..9b04c2969
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_project_category.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_tags.frm b/mariadb/mtshop/node_revision__field_tags.frm
new file mode 100644
index 000000000..6ce87781e
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_tags.frm differ
diff --git a/mariadb/mtshop/node_revision__field_tags.ibd b/mariadb/mtshop/node_revision__field_tags.ibd
new file mode 100644
index 000000000..f0b0204df
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_tags.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_text_align.frm b/mariadb/mtshop/node_revision__field_text_align.frm
new file mode 100644
index 000000000..7f5e4a93a
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_text_align.frm differ
diff --git a/mariadb/mtshop/node_revision__field_text_align.ibd b/mariadb/mtshop/node_revision__field_text_align.ibd
new file mode 100644
index 000000000..b737c4bfe
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_text_align.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_text_color.frm b/mariadb/mtshop/node_revision__field_text_color.frm
new file mode 100644
index 000000000..fecb7a6ca
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_text_color.frm differ
diff --git a/mariadb/mtshop/node_revision__field_text_color.ibd b/mariadb/mtshop/node_revision__field_text_color.ibd
new file mode 100644
index 000000000..05620cc12
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_text_color.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_twitter_link.frm b/mariadb/mtshop/node_revision__field_twitter_link.frm
new file mode 100644
index 000000000..986637896
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_twitter_link.frm differ
diff --git a/mariadb/mtshop/node_revision__field_twitter_link.ibd b/mariadb/mtshop/node_revision__field_twitter_link.ibd
new file mode 100644
index 000000000..23c00f337
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_twitter_link.ibd differ
diff --git a/mariadb/mtshop/node_revision__field_video.frm b/mariadb/mtshop/node_revision__field_video.frm
new file mode 100644
index 000000000..ef6075068
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_video.frm differ
diff --git a/mariadb/mtshop/node_revision__field_video.ibd b/mariadb/mtshop/node_revision__field_video.ibd
new file mode 100644
index 000000000..09395d64b
Binary files /dev/null and b/mariadb/mtshop/node_revision__field_video.ibd differ
diff --git a/mariadb/mtshop/node_revision__simplenews_issue.frm b/mariadb/mtshop/node_revision__simplenews_issue.frm
new file mode 100644
index 000000000..f97f58c9b
Binary files /dev/null and b/mariadb/mtshop/node_revision__simplenews_issue.frm differ
diff --git a/mariadb/mtshop/node_revision__simplenews_issue.ibd b/mariadb/mtshop/node_revision__simplenews_issue.ibd
new file mode 100644
index 000000000..d29b3de00
Binary files /dev/null and b/mariadb/mtshop/node_revision__simplenews_issue.ibd differ
diff --git a/mariadb/mtshop/path_alias.frm b/mariadb/mtshop/path_alias.frm
new file mode 100644
index 000000000..9968b2ab6
Binary files /dev/null and b/mariadb/mtshop/path_alias.frm differ
diff --git a/mariadb/mtshop/path_alias.ibd b/mariadb/mtshop/path_alias.ibd
new file mode 100644
index 000000000..8d505647e
Binary files /dev/null and b/mariadb/mtshop/path_alias.ibd differ
diff --git a/mariadb/mtshop/path_alias_revision.frm b/mariadb/mtshop/path_alias_revision.frm
new file mode 100644
index 000000000..7b3a86f3f
Binary files /dev/null and b/mariadb/mtshop/path_alias_revision.frm differ
diff --git a/mariadb/mtshop/path_alias_revision.ibd b/mariadb/mtshop/path_alias_revision.ibd
new file mode 100644
index 000000000..d93ffca79
Binary files /dev/null and b/mariadb/mtshop/path_alias_revision.ibd differ
diff --git a/mariadb/mtshop/profile.frm b/mariadb/mtshop/profile.frm
new file mode 100644
index 000000000..367303bc7
Binary files /dev/null and b/mariadb/mtshop/profile.frm differ
diff --git a/mariadb/mtshop/profile.ibd b/mariadb/mtshop/profile.ibd
new file mode 100644
index 000000000..a2a720741
Binary files /dev/null and b/mariadb/mtshop/profile.ibd differ
diff --git a/mariadb/mtshop/profile__address.frm b/mariadb/mtshop/profile__address.frm
new file mode 100644
index 000000000..8dc30b545
Binary files /dev/null and b/mariadb/mtshop/profile__address.frm differ
diff --git a/mariadb/mtshop/profile__address.ibd b/mariadb/mtshop/profile__address.ibd
new file mode 100644
index 000000000..5e6717620
Binary files /dev/null and b/mariadb/mtshop/profile__address.ibd differ
diff --git a/mariadb/mtshop/profile__tax_number.frm b/mariadb/mtshop/profile__tax_number.frm
new file mode 100644
index 000000000..36cf52b19
Binary files /dev/null and b/mariadb/mtshop/profile__tax_number.frm differ
diff --git a/mariadb/mtshop/profile__tax_number.ibd b/mariadb/mtshop/profile__tax_number.ibd
new file mode 100644
index 000000000..da2d467e0
Binary files /dev/null and b/mariadb/mtshop/profile__tax_number.ibd differ
diff --git a/mariadb/mtshop/profile_revision.frm b/mariadb/mtshop/profile_revision.frm
new file mode 100644
index 000000000..bdd6ab889
Binary files /dev/null and b/mariadb/mtshop/profile_revision.frm differ
diff --git a/mariadb/mtshop/profile_revision.ibd b/mariadb/mtshop/profile_revision.ibd
new file mode 100644
index 000000000..bcddaeb0d
Binary files /dev/null and b/mariadb/mtshop/profile_revision.ibd differ
diff --git a/mariadb/mtshop/profile_revision__address.frm b/mariadb/mtshop/profile_revision__address.frm
new file mode 100644
index 000000000..e1778d825
Binary files /dev/null and b/mariadb/mtshop/profile_revision__address.frm differ
diff --git a/mariadb/mtshop/profile_revision__address.ibd b/mariadb/mtshop/profile_revision__address.ibd
new file mode 100644
index 000000000..50fa90fd9
Binary files /dev/null and b/mariadb/mtshop/profile_revision__address.ibd differ
diff --git a/mariadb/mtshop/profile_revision__tax_number.frm b/mariadb/mtshop/profile_revision__tax_number.frm
new file mode 100644
index 000000000..c5cdcb9f0
Binary files /dev/null and b/mariadb/mtshop/profile_revision__tax_number.frm differ
diff --git a/mariadb/mtshop/profile_revision__tax_number.ibd b/mariadb/mtshop/profile_revision__tax_number.ibd
new file mode 100644
index 000000000..c73d62218
Binary files /dev/null and b/mariadb/mtshop/profile_revision__tax_number.ibd differ
diff --git a/mariadb/mtshop/queue.frm b/mariadb/mtshop/queue.frm
new file mode 100644
index 000000000..ce9c4d4aa
Binary files /dev/null and b/mariadb/mtshop/queue.frm differ
diff --git a/mariadb/mtshop/queue.ibd b/mariadb/mtshop/queue.ibd
new file mode 100644
index 000000000..1edf8dbdb
Binary files /dev/null and b/mariadb/mtshop/queue.ibd differ
diff --git a/mariadb/mtshop/redirect.frm b/mariadb/mtshop/redirect.frm
new file mode 100644
index 000000000..5ecf204d9
Binary files /dev/null and b/mariadb/mtshop/redirect.frm differ
diff --git a/mariadb/mtshop/redirect.ibd b/mariadb/mtshop/redirect.ibd
new file mode 100644
index 000000000..7ecacaed0
Binary files /dev/null and b/mariadb/mtshop/redirect.ibd differ
diff --git a/mariadb/mtshop/router.frm b/mariadb/mtshop/router.frm
new file mode 100644
index 000000000..309e13cfd
Binary files /dev/null and b/mariadb/mtshop/router.frm differ
diff --git a/mariadb/mtshop/router.ibd b/mariadb/mtshop/router.ibd
new file mode 100644
index 000000000..d151c6a26
Binary files /dev/null and b/mariadb/mtshop/router.ibd differ
diff --git a/mariadb/mtshop/search_api_item.frm b/mariadb/mtshop/search_api_item.frm
new file mode 100644
index 000000000..fac84fdff
Binary files /dev/null and b/mariadb/mtshop/search_api_item.frm differ
diff --git a/mariadb/mtshop/search_api_item.ibd b/mariadb/mtshop/search_api_item.ibd
new file mode 100644
index 000000000..46cb5857f
Binary files /dev/null and b/mariadb/mtshop/search_api_item.ibd differ
diff --git a/mariadb/mtshop/search_api_task.frm b/mariadb/mtshop/search_api_task.frm
new file mode 100644
index 000000000..a8ad209cd
Binary files /dev/null and b/mariadb/mtshop/search_api_task.frm differ
diff --git a/mariadb/mtshop/search_api_task.ibd b/mariadb/mtshop/search_api_task.ibd
new file mode 100644
index 000000000..1609a7513
Binary files /dev/null and b/mariadb/mtshop/search_api_task.ibd differ
diff --git a/mariadb/mtshop/semaphore.frm b/mariadb/mtshop/semaphore.frm
new file mode 100644
index 000000000..e3c46f3c9
Binary files /dev/null and b/mariadb/mtshop/semaphore.frm differ
diff --git a/mariadb/mtshop/semaphore.ibd b/mariadb/mtshop/semaphore.ibd
new file mode 100644
index 000000000..4ec3dd89a
Binary files /dev/null and b/mariadb/mtshop/semaphore.ibd differ
diff --git a/mariadb/mtshop/sequences.frm b/mariadb/mtshop/sequences.frm
new file mode 100644
index 000000000..bf9e806d5
Binary files /dev/null and b/mariadb/mtshop/sequences.frm differ
diff --git a/mariadb/mtshop/sequences.ibd b/mariadb/mtshop/sequences.ibd
new file mode 100644
index 000000000..27efdc344
Binary files /dev/null and b/mariadb/mtshop/sequences.ibd differ
diff --git a/mariadb/mtshop/sessions.frm b/mariadb/mtshop/sessions.frm
new file mode 100644
index 000000000..52a20b933
Binary files /dev/null and b/mariadb/mtshop/sessions.frm differ
diff --git a/mariadb/mtshop/sessions.ibd b/mariadb/mtshop/sessions.ibd
new file mode 100644
index 000000000..4cce0d12d
Binary files /dev/null and b/mariadb/mtshop/sessions.ibd differ
diff --git a/mariadb/mtshop/shortcut.frm b/mariadb/mtshop/shortcut.frm
new file mode 100644
index 000000000..0e30683b5
Binary files /dev/null and b/mariadb/mtshop/shortcut.frm differ
diff --git a/mariadb/mtshop/shortcut.ibd b/mariadb/mtshop/shortcut.ibd
new file mode 100644
index 000000000..c193b4586
Binary files /dev/null and b/mariadb/mtshop/shortcut.ibd differ
diff --git a/mariadb/mtshop/shortcut_field_data.frm b/mariadb/mtshop/shortcut_field_data.frm
new file mode 100644
index 000000000..93081a79e
Binary files /dev/null and b/mariadb/mtshop/shortcut_field_data.frm differ
diff --git a/mariadb/mtshop/shortcut_field_data.ibd b/mariadb/mtshop/shortcut_field_data.ibd
new file mode 100644
index 000000000..aa7b19039
Binary files /dev/null and b/mariadb/mtshop/shortcut_field_data.ibd differ
diff --git a/mariadb/mtshop/shortcut_set_users.frm b/mariadb/mtshop/shortcut_set_users.frm
new file mode 100644
index 000000000..5508734b6
Binary files /dev/null and b/mariadb/mtshop/shortcut_set_users.frm differ
diff --git a/mariadb/mtshop/shortcut_set_users.ibd b/mariadb/mtshop/shortcut_set_users.ibd
new file mode 100644
index 000000000..9f4097a73
Binary files /dev/null and b/mariadb/mtshop/shortcut_set_users.ibd differ
diff --git a/mariadb/mtshop/simplenews_mail_spool.frm b/mariadb/mtshop/simplenews_mail_spool.frm
new file mode 100644
index 000000000..33899323c
Binary files /dev/null and b/mariadb/mtshop/simplenews_mail_spool.frm differ
diff --git a/mariadb/mtshop/simplenews_mail_spool.ibd b/mariadb/mtshop/simplenews_mail_spool.ibd
new file mode 100644
index 000000000..25fdd8211
Binary files /dev/null and b/mariadb/mtshop/simplenews_mail_spool.ibd differ
diff --git a/mariadb/mtshop/simplenews_subscriber.frm b/mariadb/mtshop/simplenews_subscriber.frm
new file mode 100644
index 000000000..3f3dbabe7
Binary files /dev/null and b/mariadb/mtshop/simplenews_subscriber.frm differ
diff --git a/mariadb/mtshop/simplenews_subscriber.ibd b/mariadb/mtshop/simplenews_subscriber.ibd
new file mode 100644
index 000000000..a5250f45c
Binary files /dev/null and b/mariadb/mtshop/simplenews_subscriber.ibd differ
diff --git a/mariadb/mtshop/simplenews_subscriber__subscriptions.frm b/mariadb/mtshop/simplenews_subscriber__subscriptions.frm
new file mode 100644
index 000000000..8db078566
Binary files /dev/null and b/mariadb/mtshop/simplenews_subscriber__subscriptions.frm differ
diff --git a/mariadb/mtshop/simplenews_subscriber__subscriptions.ibd b/mariadb/mtshop/simplenews_subscriber__subscriptions.ibd
new file mode 100644
index 000000000..49fef7ddd
Binary files /dev/null and b/mariadb/mtshop/simplenews_subscriber__subscriptions.ibd differ
diff --git a/mariadb/mtshop/taxonomy_index.frm b/mariadb/mtshop/taxonomy_index.frm
new file mode 100644
index 000000000..5a2ba82b6
Binary files /dev/null and b/mariadb/mtshop/taxonomy_index.frm differ
diff --git a/mariadb/mtshop/taxonomy_index.ibd b/mariadb/mtshop/taxonomy_index.ibd
new file mode 100644
index 000000000..43b1a755c
Binary files /dev/null and b/mariadb/mtshop/taxonomy_index.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term__field_icon_image.frm b/mariadb/mtshop/taxonomy_term__field_icon_image.frm
new file mode 100644
index 000000000..02909c9eb
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term__field_icon_image.frm differ
diff --git a/mariadb/mtshop/taxonomy_term__field_icon_image.ibd b/mariadb/mtshop/taxonomy_term__field_icon_image.ibd
new file mode 100644
index 000000000..8222274ac
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term__field_icon_image.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term__field_image.frm b/mariadb/mtshop/taxonomy_term__field_image.frm
new file mode 100644
index 000000000..1d6542c42
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term__field_image.frm differ
diff --git a/mariadb/mtshop/taxonomy_term__field_image.ibd b/mariadb/mtshop/taxonomy_term__field_image.ibd
new file mode 100644
index 000000000..ff8fe8495
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term__field_image.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term__parent.frm b/mariadb/mtshop/taxonomy_term__parent.frm
new file mode 100644
index 000000000..97fdb74b7
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term__parent.frm differ
diff --git a/mariadb/mtshop/taxonomy_term__parent.ibd b/mariadb/mtshop/taxonomy_term__parent.ibd
new file mode 100644
index 000000000..7fd1217ba
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term__parent.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term_data.frm b/mariadb/mtshop/taxonomy_term_data.frm
new file mode 100644
index 000000000..7f6d2b850
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_data.frm differ
diff --git a/mariadb/mtshop/taxonomy_term_data.ibd b/mariadb/mtshop/taxonomy_term_data.ibd
new file mode 100644
index 000000000..f28792e4f
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_data.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term_field_data.frm b/mariadb/mtshop/taxonomy_term_field_data.frm
new file mode 100644
index 000000000..f15853fe4
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_field_data.frm differ
diff --git a/mariadb/mtshop/taxonomy_term_field_data.ibd b/mariadb/mtshop/taxonomy_term_field_data.ibd
new file mode 100644
index 000000000..0b33677f8
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_field_data.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term_field_revision.frm b/mariadb/mtshop/taxonomy_term_field_revision.frm
new file mode 100644
index 000000000..a1cd8cc82
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_field_revision.frm differ
diff --git a/mariadb/mtshop/taxonomy_term_field_revision.ibd b/mariadb/mtshop/taxonomy_term_field_revision.ibd
new file mode 100644
index 000000000..9bbcabc5b
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_field_revision.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term_revision.frm b/mariadb/mtshop/taxonomy_term_revision.frm
new file mode 100644
index 000000000..3da3ffe00
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_revision.frm differ
diff --git a/mariadb/mtshop/taxonomy_term_revision.ibd b/mariadb/mtshop/taxonomy_term_revision.ibd
new file mode 100644
index 000000000..be0d20f98
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_revision.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term_revision__field_icon_image.frm b/mariadb/mtshop/taxonomy_term_revision__field_icon_image.frm
new file mode 100644
index 000000000..cedb43417
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_revision__field_icon_image.frm differ
diff --git a/mariadb/mtshop/taxonomy_term_revision__field_icon_image.ibd b/mariadb/mtshop/taxonomy_term_revision__field_icon_image.ibd
new file mode 100644
index 000000000..b843b5bb4
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_revision__field_icon_image.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term_revision__field_image.frm b/mariadb/mtshop/taxonomy_term_revision__field_image.frm
new file mode 100644
index 000000000..cbdba3e23
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_revision__field_image.frm differ
diff --git a/mariadb/mtshop/taxonomy_term_revision__field_image.ibd b/mariadb/mtshop/taxonomy_term_revision__field_image.ibd
new file mode 100644
index 000000000..70fa32153
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_revision__field_image.ibd differ
diff --git a/mariadb/mtshop/taxonomy_term_revision__parent.frm b/mariadb/mtshop/taxonomy_term_revision__parent.frm
new file mode 100644
index 000000000..b780a6039
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_revision__parent.frm differ
diff --git a/mariadb/mtshop/taxonomy_term_revision__parent.ibd b/mariadb/mtshop/taxonomy_term_revision__parent.ibd
new file mode 100644
index 000000000..e8f429de4
Binary files /dev/null and b/mariadb/mtshop/taxonomy_term_revision__parent.ibd differ
diff --git a/mariadb/mtshop/user__commerce_remote_id.frm b/mariadb/mtshop/user__commerce_remote_id.frm
new file mode 100644
index 000000000..61b7bcfd8
Binary files /dev/null and b/mariadb/mtshop/user__commerce_remote_id.frm differ
diff --git a/mariadb/mtshop/user__commerce_remote_id.ibd b/mariadb/mtshop/user__commerce_remote_id.ibd
new file mode 100644
index 000000000..666f99888
Binary files /dev/null and b/mariadb/mtshop/user__commerce_remote_id.ibd differ
diff --git a/mariadb/mtshop/user__roles.frm b/mariadb/mtshop/user__roles.frm
new file mode 100644
index 000000000..3ce83514b
Binary files /dev/null and b/mariadb/mtshop/user__roles.frm differ
diff --git a/mariadb/mtshop/user__roles.ibd b/mariadb/mtshop/user__roles.ibd
new file mode 100644
index 000000000..1b4023934
Binary files /dev/null and b/mariadb/mtshop/user__roles.ibd differ
diff --git a/mariadb/mtshop/user__user_picture.frm b/mariadb/mtshop/user__user_picture.frm
new file mode 100644
index 000000000..f0325d4ae
Binary files /dev/null and b/mariadb/mtshop/user__user_picture.frm differ
diff --git a/mariadb/mtshop/user__user_picture.ibd b/mariadb/mtshop/user__user_picture.ibd
new file mode 100644
index 000000000..66b154f59
Binary files /dev/null and b/mariadb/mtshop/user__user_picture.ibd differ
diff --git a/mariadb/mtshop/users.frm b/mariadb/mtshop/users.frm
new file mode 100644
index 000000000..68e7bad7c
Binary files /dev/null and b/mariadb/mtshop/users.frm differ
diff --git a/mariadb/mtshop/users.ibd b/mariadb/mtshop/users.ibd
new file mode 100644
index 000000000..64d70ebd5
Binary files /dev/null and b/mariadb/mtshop/users.ibd differ
diff --git a/mariadb/mtshop/users_data.frm b/mariadb/mtshop/users_data.frm
new file mode 100644
index 000000000..5a6ee6c08
Binary files /dev/null and b/mariadb/mtshop/users_data.frm differ
diff --git a/mariadb/mtshop/users_data.ibd b/mariadb/mtshop/users_data.ibd
new file mode 100644
index 000000000..2be632fc5
Binary files /dev/null and b/mariadb/mtshop/users_data.ibd differ
diff --git a/mariadb/mtshop/users_field_data.frm b/mariadb/mtshop/users_field_data.frm
new file mode 100644
index 000000000..1b0fca72f
Binary files /dev/null and b/mariadb/mtshop/users_field_data.frm differ
diff --git a/mariadb/mtshop/users_field_data.ibd b/mariadb/mtshop/users_field_data.ibd
new file mode 100644
index 000000000..23e197d8e
Binary files /dev/null and b/mariadb/mtshop/users_field_data.ibd differ
diff --git a/mariadb/mtshop/votingapi_result.frm b/mariadb/mtshop/votingapi_result.frm
new file mode 100644
index 000000000..5aa7b4a11
Binary files /dev/null and b/mariadb/mtshop/votingapi_result.frm differ
diff --git a/mariadb/mtshop/votingapi_result.ibd b/mariadb/mtshop/votingapi_result.ibd
new file mode 100644
index 000000000..4982d7c0f
Binary files /dev/null and b/mariadb/mtshop/votingapi_result.ibd differ
diff --git a/mariadb/mtshop/votingapi_vote.frm b/mariadb/mtshop/votingapi_vote.frm
new file mode 100644
index 000000000..29d8bf04d
Binary files /dev/null and b/mariadb/mtshop/votingapi_vote.frm differ
diff --git a/mariadb/mtshop/votingapi_vote.ibd b/mariadb/mtshop/votingapi_vote.ibd
new file mode 100644
index 000000000..0ee12f55b
Binary files /dev/null and b/mariadb/mtshop/votingapi_vote.ibd differ
diff --git a/mariadb/mtshop/watchdog.frm b/mariadb/mtshop/watchdog.frm
new file mode 100644
index 000000000..6fdb5e038
Binary files /dev/null and b/mariadb/mtshop/watchdog.frm differ
diff --git a/mariadb/mtshop/watchdog.ibd b/mariadb/mtshop/watchdog.ibd
new file mode 100644
index 000000000..9bb2eeec1
Binary files /dev/null and b/mariadb/mtshop/watchdog.ibd differ
diff --git a/mariadb/multi-master.info b/mariadb/multi-master.info
new file mode 100644
index 000000000..e69de29bb
diff --git a/mariadb/mysql/column_stats.MAD b/mariadb/mysql/column_stats.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/column_stats.MAD differ
diff --git a/mariadb/mysql/column_stats.MAI b/mariadb/mysql/column_stats.MAI
new file mode 100644
index 000000000..ed75ee67e
Binary files /dev/null and b/mariadb/mysql/column_stats.MAI differ
diff --git a/mariadb/mysql/column_stats.frm b/mariadb/mysql/column_stats.frm
new file mode 100644
index 000000000..22be46d42
Binary files /dev/null and b/mariadb/mysql/column_stats.frm differ
diff --git a/mariadb/mysql/columns_priv.MAD b/mariadb/mysql/columns_priv.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/columns_priv.MAD differ
diff --git a/mariadb/mysql/columns_priv.MAI b/mariadb/mysql/columns_priv.MAI
new file mode 100644
index 000000000..39462997b
Binary files /dev/null and b/mariadb/mysql/columns_priv.MAI differ
diff --git a/mariadb/mysql/columns_priv.frm b/mariadb/mysql/columns_priv.frm
new file mode 100644
index 000000000..ca815e7a3
Binary files /dev/null and b/mariadb/mysql/columns_priv.frm differ
diff --git a/mariadb/mysql/db.MAD b/mariadb/mysql/db.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/db.MAD differ
diff --git a/mariadb/mysql/db.MAI b/mariadb/mysql/db.MAI
new file mode 100644
index 000000000..af6d7bad6
Binary files /dev/null and b/mariadb/mysql/db.MAI differ
diff --git a/mariadb/mysql/db.frm b/mariadb/mysql/db.frm
new file mode 100644
index 000000000..e2f7e691e
Binary files /dev/null and b/mariadb/mysql/db.frm differ
diff --git a/mariadb/mysql/db.opt b/mariadb/mysql/db.opt
new file mode 100644
index 000000000..ccbf69992
--- /dev/null
+++ b/mariadb/mysql/db.opt
@@ -0,0 +1,2 @@
+default-character-set=utf8mb4
+default-collation=utf8mb4_general_ci
diff --git a/mariadb/mysql/event.MAD b/mariadb/mysql/event.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/event.MAD differ
diff --git a/mariadb/mysql/event.MAI b/mariadb/mysql/event.MAI
new file mode 100644
index 000000000..ba91ed1bc
Binary files /dev/null and b/mariadb/mysql/event.MAI differ
diff --git a/mariadb/mysql/event.frm b/mariadb/mysql/event.frm
new file mode 100644
index 000000000..73c831524
Binary files /dev/null and b/mariadb/mysql/event.frm differ
diff --git a/mariadb/mysql/func.MAD b/mariadb/mysql/func.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/func.MAD differ
diff --git a/mariadb/mysql/func.MAI b/mariadb/mysql/func.MAI
new file mode 100644
index 000000000..ad8c6b65d
Binary files /dev/null and b/mariadb/mysql/func.MAI differ
diff --git a/mariadb/mysql/func.frm b/mariadb/mysql/func.frm
new file mode 100644
index 000000000..0b9432f44
Binary files /dev/null and b/mariadb/mysql/func.frm differ
diff --git a/mariadb/mysql/general_log.CSM b/mariadb/mysql/general_log.CSM
new file mode 100644
index 000000000..8d08b8db9
Binary files /dev/null and b/mariadb/mysql/general_log.CSM differ
diff --git a/mariadb/mysql/general_log.CSV b/mariadb/mysql/general_log.CSV
new file mode 100644
index 000000000..e69de29bb
diff --git a/mariadb/mysql/general_log.frm b/mariadb/mysql/general_log.frm
new file mode 100644
index 000000000..e25af4972
Binary files /dev/null and b/mariadb/mysql/general_log.frm differ
diff --git a/mariadb/mysql/global_priv.MAD b/mariadb/mysql/global_priv.MAD
new file mode 100644
index 000000000..9cae5928a
Binary files /dev/null and b/mariadb/mysql/global_priv.MAD differ
diff --git a/mariadb/mysql/global_priv.MAI b/mariadb/mysql/global_priv.MAI
new file mode 100644
index 000000000..0fb93ecb9
Binary files /dev/null and b/mariadb/mysql/global_priv.MAI differ
diff --git a/mariadb/mysql/global_priv.frm b/mariadb/mysql/global_priv.frm
new file mode 100644
index 000000000..3a718c63d
Binary files /dev/null and b/mariadb/mysql/global_priv.frm differ
diff --git a/mariadb/mysql/gtid_slave_pos.frm b/mariadb/mysql/gtid_slave_pos.frm
new file mode 100644
index 000000000..9a05b72e1
Binary files /dev/null and b/mariadb/mysql/gtid_slave_pos.frm differ
diff --git a/mariadb/mysql/gtid_slave_pos.ibd b/mariadb/mysql/gtid_slave_pos.ibd
new file mode 100644
index 000000000..42a4e5377
Binary files /dev/null and b/mariadb/mysql/gtid_slave_pos.ibd differ
diff --git a/mariadb/mysql/help_category.MAD b/mariadb/mysql/help_category.MAD
new file mode 100644
index 000000000..37faeacd8
Binary files /dev/null and b/mariadb/mysql/help_category.MAD differ
diff --git a/mariadb/mysql/help_category.MAI b/mariadb/mysql/help_category.MAI
new file mode 100644
index 000000000..954f3afa8
Binary files /dev/null and b/mariadb/mysql/help_category.MAI differ
diff --git a/mariadb/mysql/help_category.frm b/mariadb/mysql/help_category.frm
new file mode 100644
index 000000000..84da17f60
Binary files /dev/null and b/mariadb/mysql/help_category.frm differ
diff --git a/mariadb/mysql/help_keyword.MAD b/mariadb/mysql/help_keyword.MAD
new file mode 100644
index 000000000..796b29911
Binary files /dev/null and b/mariadb/mysql/help_keyword.MAD differ
diff --git a/mariadb/mysql/help_keyword.MAI b/mariadb/mysql/help_keyword.MAI
new file mode 100644
index 000000000..3f99f71e5
Binary files /dev/null and b/mariadb/mysql/help_keyword.MAI differ
diff --git a/mariadb/mysql/help_keyword.frm b/mariadb/mysql/help_keyword.frm
new file mode 100644
index 000000000..d510c5dd1
Binary files /dev/null and b/mariadb/mysql/help_keyword.frm differ
diff --git a/mariadb/mysql/help_relation.MAD b/mariadb/mysql/help_relation.MAD
new file mode 100644
index 000000000..477d08da6
Binary files /dev/null and b/mariadb/mysql/help_relation.MAD differ
diff --git a/mariadb/mysql/help_relation.MAI b/mariadb/mysql/help_relation.MAI
new file mode 100644
index 000000000..b7f2580ec
Binary files /dev/null and b/mariadb/mysql/help_relation.MAI differ
diff --git a/mariadb/mysql/help_relation.frm b/mariadb/mysql/help_relation.frm
new file mode 100644
index 000000000..6b71989ec
Binary files /dev/null and b/mariadb/mysql/help_relation.frm differ
diff --git a/mariadb/mysql/help_topic.MAD b/mariadb/mysql/help_topic.MAD
new file mode 100644
index 000000000..881bc21cb
Binary files /dev/null and b/mariadb/mysql/help_topic.MAD differ
diff --git a/mariadb/mysql/help_topic.MAI b/mariadb/mysql/help_topic.MAI
new file mode 100644
index 000000000..fa88df9f1
Binary files /dev/null and b/mariadb/mysql/help_topic.MAI differ
diff --git a/mariadb/mysql/help_topic.frm b/mariadb/mysql/help_topic.frm
new file mode 100644
index 000000000..0d4868a14
Binary files /dev/null and b/mariadb/mysql/help_topic.frm differ
diff --git a/mariadb/mysql/index_stats.MAD b/mariadb/mysql/index_stats.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/index_stats.MAD differ
diff --git a/mariadb/mysql/index_stats.MAI b/mariadb/mysql/index_stats.MAI
new file mode 100644
index 000000000..349b6cfd0
Binary files /dev/null and b/mariadb/mysql/index_stats.MAI differ
diff --git a/mariadb/mysql/index_stats.frm b/mariadb/mysql/index_stats.frm
new file mode 100644
index 000000000..8444a05ae
Binary files /dev/null and b/mariadb/mysql/index_stats.frm differ
diff --git a/mariadb/mysql/innodb_index_stats.frm b/mariadb/mysql/innodb_index_stats.frm
new file mode 100644
index 000000000..4fcf6e405
Binary files /dev/null and b/mariadb/mysql/innodb_index_stats.frm differ
diff --git a/mariadb/mysql/innodb_index_stats.ibd b/mariadb/mysql/innodb_index_stats.ibd
new file mode 100644
index 000000000..28473b6e2
Binary files /dev/null and b/mariadb/mysql/innodb_index_stats.ibd differ
diff --git a/mariadb/mysql/innodb_table_stats.frm b/mariadb/mysql/innodb_table_stats.frm
new file mode 100644
index 000000000..a091d8630
Binary files /dev/null and b/mariadb/mysql/innodb_table_stats.frm differ
diff --git a/mariadb/mysql/innodb_table_stats.ibd b/mariadb/mysql/innodb_table_stats.ibd
new file mode 100644
index 000000000..146216582
Binary files /dev/null and b/mariadb/mysql/innodb_table_stats.ibd differ
diff --git a/mariadb/mysql/plugin.MAD b/mariadb/mysql/plugin.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/plugin.MAD differ
diff --git a/mariadb/mysql/plugin.MAI b/mariadb/mysql/plugin.MAI
new file mode 100644
index 000000000..80950e307
Binary files /dev/null and b/mariadb/mysql/plugin.MAI differ
diff --git a/mariadb/mysql/plugin.frm b/mariadb/mysql/plugin.frm
new file mode 100644
index 000000000..413b3648e
Binary files /dev/null and b/mariadb/mysql/plugin.frm differ
diff --git a/mariadb/mysql/proc.MAD b/mariadb/mysql/proc.MAD
new file mode 100644
index 000000000..5a313b3e0
Binary files /dev/null and b/mariadb/mysql/proc.MAD differ
diff --git a/mariadb/mysql/proc.MAI b/mariadb/mysql/proc.MAI
new file mode 100644
index 000000000..6477b74c5
Binary files /dev/null and b/mariadb/mysql/proc.MAI differ
diff --git a/mariadb/mysql/proc.frm b/mariadb/mysql/proc.frm
new file mode 100644
index 000000000..10484fe70
Binary files /dev/null and b/mariadb/mysql/proc.frm differ
diff --git a/mariadb/mysql/procs_priv.MAD b/mariadb/mysql/procs_priv.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/procs_priv.MAD differ
diff --git a/mariadb/mysql/procs_priv.MAI b/mariadb/mysql/procs_priv.MAI
new file mode 100644
index 000000000..1cbe3ca74
Binary files /dev/null and b/mariadb/mysql/procs_priv.MAI differ
diff --git a/mariadb/mysql/procs_priv.frm b/mariadb/mysql/procs_priv.frm
new file mode 100644
index 000000000..92480131f
Binary files /dev/null and b/mariadb/mysql/procs_priv.frm differ
diff --git a/mariadb/mysql/proxies_priv.MAD b/mariadb/mysql/proxies_priv.MAD
new file mode 100644
index 000000000..be9a4b425
Binary files /dev/null and b/mariadb/mysql/proxies_priv.MAD differ
diff --git a/mariadb/mysql/proxies_priv.MAI b/mariadb/mysql/proxies_priv.MAI
new file mode 100644
index 000000000..362e9cc77
Binary files /dev/null and b/mariadb/mysql/proxies_priv.MAI differ
diff --git a/mariadb/mysql/proxies_priv.frm b/mariadb/mysql/proxies_priv.frm
new file mode 100644
index 000000000..5a1a4712c
Binary files /dev/null and b/mariadb/mysql/proxies_priv.frm differ
diff --git a/mariadb/mysql/roles_mapping.MAD b/mariadb/mysql/roles_mapping.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/roles_mapping.MAD differ
diff --git a/mariadb/mysql/roles_mapping.MAI b/mariadb/mysql/roles_mapping.MAI
new file mode 100644
index 000000000..322496e61
Binary files /dev/null and b/mariadb/mysql/roles_mapping.MAI differ
diff --git a/mariadb/mysql/roles_mapping.frm b/mariadb/mysql/roles_mapping.frm
new file mode 100644
index 000000000..9c6b65743
Binary files /dev/null and b/mariadb/mysql/roles_mapping.frm differ
diff --git a/mariadb/mysql/servers.MAD b/mariadb/mysql/servers.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/servers.MAD differ
diff --git a/mariadb/mysql/servers.MAI b/mariadb/mysql/servers.MAI
new file mode 100644
index 000000000..380a01d66
Binary files /dev/null and b/mariadb/mysql/servers.MAI differ
diff --git a/mariadb/mysql/servers.frm b/mariadb/mysql/servers.frm
new file mode 100644
index 000000000..d42902cd6
Binary files /dev/null and b/mariadb/mysql/servers.frm differ
diff --git a/mariadb/mysql/slow_log.CSM b/mariadb/mysql/slow_log.CSM
new file mode 100644
index 000000000..8d08b8db9
Binary files /dev/null and b/mariadb/mysql/slow_log.CSM differ
diff --git a/mariadb/mysql/slow_log.CSV b/mariadb/mysql/slow_log.CSV
new file mode 100644
index 000000000..e69de29bb
diff --git a/mariadb/mysql/slow_log.frm b/mariadb/mysql/slow_log.frm
new file mode 100644
index 000000000..0c95dfa25
Binary files /dev/null and b/mariadb/mysql/slow_log.frm differ
diff --git a/mariadb/mysql/table_stats.MAD b/mariadb/mysql/table_stats.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/table_stats.MAD differ
diff --git a/mariadb/mysql/table_stats.MAI b/mariadb/mysql/table_stats.MAI
new file mode 100644
index 000000000..3ff9c7002
Binary files /dev/null and b/mariadb/mysql/table_stats.MAI differ
diff --git a/mariadb/mysql/table_stats.frm b/mariadb/mysql/table_stats.frm
new file mode 100644
index 000000000..95ff18bea
Binary files /dev/null and b/mariadb/mysql/table_stats.frm differ
diff --git a/mariadb/mysql/tables_priv.MAD b/mariadb/mysql/tables_priv.MAD
new file mode 100644
index 000000000..74de09ac7
Binary files /dev/null and b/mariadb/mysql/tables_priv.MAD differ
diff --git a/mariadb/mysql/tables_priv.MAI b/mariadb/mysql/tables_priv.MAI
new file mode 100644
index 000000000..b269ee85d
Binary files /dev/null and b/mariadb/mysql/tables_priv.MAI differ
diff --git a/mariadb/mysql/tables_priv.frm b/mariadb/mysql/tables_priv.frm
new file mode 100644
index 000000000..94038b70c
Binary files /dev/null and b/mariadb/mysql/tables_priv.frm differ
diff --git a/mariadb/mysql/time_zone.MAD b/mariadb/mysql/time_zone.MAD
new file mode 100644
index 000000000..5f14351af
Binary files /dev/null and b/mariadb/mysql/time_zone.MAD differ
diff --git a/mariadb/mysql/time_zone.MAI b/mariadb/mysql/time_zone.MAI
new file mode 100644
index 000000000..e561c59c5
Binary files /dev/null and b/mariadb/mysql/time_zone.MAI differ
diff --git a/mariadb/mysql/time_zone.frm b/mariadb/mysql/time_zone.frm
new file mode 100644
index 000000000..0f5b8ed4b
Binary files /dev/null and b/mariadb/mysql/time_zone.frm differ
diff --git a/mariadb/mysql/time_zone_leap_second.MAD b/mariadb/mysql/time_zone_leap_second.MAD
new file mode 100644
index 000000000..3dcc005ec
Binary files /dev/null and b/mariadb/mysql/time_zone_leap_second.MAD differ
diff --git a/mariadb/mysql/time_zone_leap_second.MAI b/mariadb/mysql/time_zone_leap_second.MAI
new file mode 100644
index 000000000..da6586f4c
Binary files /dev/null and b/mariadb/mysql/time_zone_leap_second.MAI differ
diff --git a/mariadb/mysql/time_zone_leap_second.frm b/mariadb/mysql/time_zone_leap_second.frm
new file mode 100644
index 000000000..7eb941fba
Binary files /dev/null and b/mariadb/mysql/time_zone_leap_second.frm differ
diff --git a/mariadb/mysql/time_zone_name.MAD b/mariadb/mysql/time_zone_name.MAD
new file mode 100644
index 000000000..d2fac61c1
Binary files /dev/null and b/mariadb/mysql/time_zone_name.MAD differ
diff --git a/mariadb/mysql/time_zone_name.MAI b/mariadb/mysql/time_zone_name.MAI
new file mode 100644
index 000000000..dc5bdeaf4
Binary files /dev/null and b/mariadb/mysql/time_zone_name.MAI differ
diff --git a/mariadb/mysql/time_zone_name.frm b/mariadb/mysql/time_zone_name.frm
new file mode 100644
index 000000000..1c60eae46
Binary files /dev/null and b/mariadb/mysql/time_zone_name.frm differ
diff --git a/mariadb/mysql/time_zone_transition.MAD b/mariadb/mysql/time_zone_transition.MAD
new file mode 100644
index 000000000..2eec2f4e5
Binary files /dev/null and b/mariadb/mysql/time_zone_transition.MAD differ
diff --git a/mariadb/mysql/time_zone_transition.MAI b/mariadb/mysql/time_zone_transition.MAI
new file mode 100644
index 000000000..5af8f1e19
Binary files /dev/null and b/mariadb/mysql/time_zone_transition.MAI differ
diff --git a/mariadb/mysql/time_zone_transition.frm b/mariadb/mysql/time_zone_transition.frm
new file mode 100644
index 000000000..d1e022268
Binary files /dev/null and b/mariadb/mysql/time_zone_transition.frm differ
diff --git a/mariadb/mysql/time_zone_transition_type.MAD b/mariadb/mysql/time_zone_transition_type.MAD
new file mode 100644
index 000000000..fcd6fe81b
Binary files /dev/null and b/mariadb/mysql/time_zone_transition_type.MAD differ
diff --git a/mariadb/mysql/time_zone_transition_type.MAI b/mariadb/mysql/time_zone_transition_type.MAI
new file mode 100644
index 000000000..6451f467b
Binary files /dev/null and b/mariadb/mysql/time_zone_transition_type.MAI differ
diff --git a/mariadb/mysql/time_zone_transition_type.frm b/mariadb/mysql/time_zone_transition_type.frm
new file mode 100644
index 000000000..4fb4fd4df
Binary files /dev/null and b/mariadb/mysql/time_zone_transition_type.frm differ
diff --git a/mariadb/mysql/transaction_registry.frm b/mariadb/mysql/transaction_registry.frm
new file mode 100644
index 000000000..bd6f264de
Binary files /dev/null and b/mariadb/mysql/transaction_registry.frm differ
diff --git a/mariadb/mysql/transaction_registry.ibd b/mariadb/mysql/transaction_registry.ibd
new file mode 100644
index 000000000..2406c0a12
Binary files /dev/null and b/mariadb/mysql/transaction_registry.ibd differ
diff --git a/mariadb/mysql/user.frm b/mariadb/mysql/user.frm
new file mode 100644
index 000000000..3e8a9c761
--- /dev/null
+++ b/mariadb/mysql/user.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `mysql`.`global_priv`.`Host` AS `Host`,`mysql`.`global_priv`.`User` AS `User`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.plugin\') in (\'mysql_native_password\',\'mysql_old_password\'),ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.authentication_string\'),\'\'),\'\') AS `Password`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 1,\'Y\',\'N\') AS `Select_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 2,\'Y\',\'N\') AS `Insert_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 4,\'Y\',\'N\') AS `Update_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 8,\'Y\',\'N\') AS `Delete_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 16,\'Y\',\'N\') AS `Create_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 32,\'Y\',\'N\') AS `Drop_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 64,\'Y\',\'N\') AS `Reload_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 128,\'Y\',\'N\') AS `Shutdown_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 256,\'Y\',\'N\') AS `Process_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 512,\'Y\',\'N\') AS `File_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 1024,\'Y\',\'N\') AS `Grant_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 2048,\'Y\',\'N\') AS `References_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 4096,\'Y\',\'N\') AS `Index_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 8192,\'Y\',\'N\') AS `Alter_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 16384,\'Y\',\'N\') AS `Show_db_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 32768,\'Y\',\'N\') AS `Super_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 65536,\'Y\',\'N\') AS `Create_tmp_table_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 131072,\'Y\',\'N\') AS `Lock_tables_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 262144,\'Y\',\'N\') AS `Execute_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 524288,\'Y\',\'N\') AS `Repl_slave_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 1048576,\'Y\',\'N\') AS `Repl_client_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 2097152,\'Y\',\'N\') AS `Create_view_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 4194304,\'Y\',\'N\') AS `Show_view_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 8388608,\'Y\',\'N\') AS `Create_routine_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 16777216,\'Y\',\'N\') AS `Alter_routine_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 33554432,\'Y\',\'N\') AS `Create_user_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 67108864,\'Y\',\'N\') AS `Event_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 134217728,\'Y\',\'N\') AS `Trigger_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 268435456,\'Y\',\'N\') AS `Create_tablespace_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 536870912,\'Y\',\'N\') AS `Delete_history_priv`,elt(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.ssl_type\'),0) + 1,\'\',\'ANY\',\'X509\',\'SPECIFIED\') AS `ssl_type`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.ssl_cipher\'),\'\') AS `ssl_cipher`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.x509_issuer\'),\'\') AS `x509_issuer`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.x509_subject\'),\'\') AS `x509_subject`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_questions\'),0) as unsigned) AS `max_questions`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_updates\'),0) as unsigned) AS `max_updates`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_connections\'),0) as unsigned) AS `max_connections`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_user_connections\'),0) as signed) AS `max_user_connections`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.plugin\'),\'\') AS `plugin`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.authentication_string\'),\'\') AS `authentication_string`,if(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.password_last_changed\'),1) = 0,\'Y\',\'N\') AS `password_expired`,elt(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.is_role\'),0) + 1,\'N\',\'Y\') AS `is_role`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.default_role\'),\'\') AS `default_role`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_statement_time\'),0.0) as decimal(12,6)) AS `max_statement_time` from `mysql`.`global_priv`
+md5=9e8063501afc8396f55d7c723632d5d8
+updatable=1
+algorithm=0
+definer_user=mariadb.sys
+definer_host=localhost
+suid=1
+with_check_option=0
+timestamp=0001700153636340912
+create-version=2
+source=SELECT\n  Host,\n  User,\n  IF(JSON_VALUE(Priv, \'$.plugin\') IN (\'mysql_native_password\', \'mysql_old_password\'), IFNULL(JSON_VALUE(Priv, \'$.authentication_string\'), \'\'), \'\') AS Password,\n  IF(JSON_VALUE(Priv, \'$.access\') &         1, \'Y\', \'N\') AS Select_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &         2, \'Y\', \'N\') AS Insert_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &         4, \'Y\', \'N\') AS Update_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &         8, \'Y\', \'N\') AS Delete_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &        16, \'Y\', \'N\') AS Create_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &        32, \'Y\', \'N\') AS Drop_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &        64, \'Y\', \'N\') AS Reload_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &       128, \'Y\', \'N\') AS Shutdown_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &       256, \'Y\', \'N\') AS Process_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &       512, \'Y\', \'N\') AS File_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &      1024, \'Y\', \'N\') AS Grant_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &      2048, \'Y\', \'N\') AS References_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &      4096, \'Y\', \'N\') AS Index_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &      8192, \'Y\', \'N\') AS Alter_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &     16384, \'Y\', \'N\') AS Show_db_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &     32768, \'Y\', \'N\') AS Super_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &     65536, \'Y\', \'N\') AS Create_tmp_table_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &    131072, \'Y\', \'N\') AS Lock_tables_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &    262144, \'Y\', \'N\') AS Execute_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &    524288, \'Y\', \'N\') AS Repl_slave_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &   1048576, \'Y\', \'N\') AS Repl_client_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &   2097152, \'Y\', \'N\') AS Create_view_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &   4194304, \'Y\', \'N\') AS Show_view_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &   8388608, \'Y\', \'N\') AS Create_routine_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &  16777216, \'Y\', \'N\') AS Alter_routine_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &  33554432, \'Y\', \'N\') AS Create_user_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') &  67108864, \'Y\', \'N\') AS Event_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') & 134217728, \'Y\', \'N\') AS Trigger_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') & 268435456, \'Y\', \'N\') AS Create_tablespace_priv,\n  IF(JSON_VALUE(Priv, \'$.access\') & 536870912, \'Y\', \'N\') AS Delete_history_priv,\n  ELT(IFNULL(JSON_VALUE(Priv, \'$.ssl_type\'), 0) + 1, \'\', \'ANY\',\'X509\', \'SPECIFIED\') AS ssl_type,\n  IFNULL(JSON_VALUE(Priv, \'$.ssl_cipher\'), \'\') AS ssl_cipher,\n  IFNULL(JSON_VALUE(Priv, \'$.x509_issuer\'), \'\') AS x509_issuer,\n  IFNULL(JSON_VALUE(Priv, \'$.x509_subject\'), \'\') AS x509_subject,\n  CAST(IFNULL(JSON_VALUE(Priv, \'$.max_questions\'), 0) AS UNSIGNED) AS max_questions,\n  CAST(IFNULL(JSON_VALUE(Priv, \'$.max_updates\'), 0) AS UNSIGNED) AS max_updates,\n  CAST(IFNULL(JSON_VALUE(Priv, \'$.max_connections\'), 0) AS UNSIGNED) AS max_connections,\n  CAST(IFNULL(JSON_VALUE(Priv, \'$.max_user_connections\'), 0) AS SIGNED) AS max_user_connections,\n  IFNULL(JSON_VALUE(Priv, \'$.plugin\'), \'\') AS plugin,\n  IFNULL(JSON_VALUE(Priv, \'$.authentication_string\'), \'\') AS authentication_string,\n  IF(IFNULL(JSON_VALUE(Priv, \'$.password_last_changed\'), 1) = 0, \'Y\', \'N\') AS password_expired,\n  ELT(IFNULL(JSON_VALUE(Priv, \'$.is_role\'), 0) + 1, \'N\', \'Y\') AS is_role,\n  IFNULL(JSON_VALUE(Priv, \'$.default_role\'), \'\') AS default_role,\n  CAST(IFNULL(JSON_VALUE(Priv, \'$.max_statement_time\'), 0.0) AS DECIMAL(12,6)) AS max_statement_time\n  FROM global_priv;
+client_cs_name=utf8mb4
+connection_cl_name=utf8mb4_general_ci
+view_body_utf8=select `mysql`.`global_priv`.`Host` AS `Host`,`mysql`.`global_priv`.`User` AS `User`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.plugin\') in (\'mysql_native_password\',\'mysql_old_password\'),ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.authentication_string\'),\'\'),\'\') AS `Password`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 1,\'Y\',\'N\') AS `Select_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 2,\'Y\',\'N\') AS `Insert_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 4,\'Y\',\'N\') AS `Update_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 8,\'Y\',\'N\') AS `Delete_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 16,\'Y\',\'N\') AS `Create_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 32,\'Y\',\'N\') AS `Drop_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 64,\'Y\',\'N\') AS `Reload_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 128,\'Y\',\'N\') AS `Shutdown_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 256,\'Y\',\'N\') AS `Process_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 512,\'Y\',\'N\') AS `File_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 1024,\'Y\',\'N\') AS `Grant_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 2048,\'Y\',\'N\') AS `References_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 4096,\'Y\',\'N\') AS `Index_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 8192,\'Y\',\'N\') AS `Alter_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 16384,\'Y\',\'N\') AS `Show_db_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 32768,\'Y\',\'N\') AS `Super_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 65536,\'Y\',\'N\') AS `Create_tmp_table_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 131072,\'Y\',\'N\') AS `Lock_tables_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 262144,\'Y\',\'N\') AS `Execute_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 524288,\'Y\',\'N\') AS `Repl_slave_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 1048576,\'Y\',\'N\') AS `Repl_client_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 2097152,\'Y\',\'N\') AS `Create_view_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 4194304,\'Y\',\'N\') AS `Show_view_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 8388608,\'Y\',\'N\') AS `Create_routine_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 16777216,\'Y\',\'N\') AS `Alter_routine_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 33554432,\'Y\',\'N\') AS `Create_user_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 67108864,\'Y\',\'N\') AS `Event_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 134217728,\'Y\',\'N\') AS `Trigger_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 268435456,\'Y\',\'N\') AS `Create_tablespace_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,\'$.access\') & 536870912,\'Y\',\'N\') AS `Delete_history_priv`,elt(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.ssl_type\'),0) + 1,\'\',\'ANY\',\'X509\',\'SPECIFIED\') AS `ssl_type`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.ssl_cipher\'),\'\') AS `ssl_cipher`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.x509_issuer\'),\'\') AS `x509_issuer`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.x509_subject\'),\'\') AS `x509_subject`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_questions\'),0) as unsigned) AS `max_questions`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_updates\'),0) as unsigned) AS `max_updates`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_connections\'),0) as unsigned) AS `max_connections`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_user_connections\'),0) as signed) AS `max_user_connections`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.plugin\'),\'\') AS `plugin`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.authentication_string\'),\'\') AS `authentication_string`,if(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.password_last_changed\'),1) = 0,\'Y\',\'N\') AS `password_expired`,elt(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.is_role\'),0) + 1,\'N\',\'Y\') AS `is_role`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.default_role\'),\'\') AS `default_role`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,\'$.max_statement_time\'),0.0) as decimal(12,6)) AS `max_statement_time` from `mysql`.`global_priv`
+mariadb-version=110103
diff --git a/mariadb/performance_schema/db.opt b/mariadb/performance_schema/db.opt
new file mode 100644
index 000000000..22f8585ca
--- /dev/null
+++ b/mariadb/performance_schema/db.opt
@@ -0,0 +1,2 @@
+default-character-set=utf8mb3
+default-collation=utf8mb3_general_ci
diff --git a/mariadb/sys/db.opt b/mariadb/sys/db.opt
new file mode 100644
index 000000000..22f8585ca
--- /dev/null
+++ b/mariadb/sys/db.opt
@@ -0,0 +1,2 @@
+default-character-set=utf8mb3
+default-collation=utf8mb3_general_ci
diff --git a/mariadb/sys/host_summary.frm b/mariadb/sys/host_summary.frm
new file mode 100644
index 000000000..dc55eeef3
--- /dev/null
+++ b/mariadb/sys/host_summary.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`accounts`.`HOST` is null,\'background\',`performance_schema`.`accounts`.`HOST`) AS `host`,sum(`stmt`.`total`) AS `statements`,format_pico_time(sum(`stmt`.`total_latency`)) AS `statement_latency`,format_pico_time(ifnull(sum(`stmt`.`total_latency`) / nullif(sum(`stmt`.`total`),0),0)) AS `statement_avg_latency`,sum(`stmt`.`full_scans`) AS `table_scans`,sum(`io`.`ios`) AS `file_ios`,format_pico_time(sum(`io`.`io_latency`)) AS `file_io_latency`,sum(`performance_schema`.`accounts`.`CURRENT_CONNECTIONS`) AS `current_connections`,sum(`performance_schema`.`accounts`.`TOTAL_CONNECTIONS`) AS `total_connections`,count(distinct `performance_schema`.`accounts`.`USER`) AS `unique_users`,`sys`.`format_bytes`(sum(`mem`.`current_allocated`)) AS `current_memory`,`sys`.`format_bytes`(sum(`mem`.`total_allocated`)) AS `total_memory_allocated` from (((`performance_schema`.`accounts` join `sys`.`x$host_summary_by_statement_latency` `stmt` on(`performance_schema`.`accounts`.`HOST` = `stmt`.`host`)) join `sys`.`x$host_summary_by_file_io` `io` on(`performance_schema`.`accounts`.`HOST` = `io`.`host`)) join `sys`.`x$memory_by_host_by_current_bytes` `mem` on(`performance_schema`.`accounts`.`HOST` = `mem`.`host`)) group by if(`performance_schema`.`accounts`.`HOST` is null,\'background\',`performance_schema`.`accounts`.`HOST`)
+md5=9d308ebdfc57e16758aca9e4c6a95b19
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651824522
+create-version=2
+source=SELECT IF(accounts.host IS NULL, \'background\', accounts.host) AS host,\n       SUM(stmt.total) AS statements,\n       format_pico_time(SUM(stmt.total_latency)) AS statement_latency,\n       format_pico_time(IFNULL(SUM(stmt.total_latency) / NULLIF(SUM(stmt.total), 0), 0)) AS statement_avg_latency,\n       SUM(stmt.full_scans) AS table_scans,\n       SUM(io.ios) AS file_ios,\n       format_pico_time(SUM(io.io_latency)) AS file_io_latency,\n       SUM(accounts.current_connections) AS current_connections,\n       SUM(accounts.total_connections) AS total_connections,\n       COUNT(DISTINCT user) AS unique_users,\n       sys.format_bytes(SUM(mem.current_allocated)) AS current_memory,\n       sys.format_bytes(SUM(mem.total_allocated)) AS total_memory_allocated\n  FROM performance_schema.accounts\n  JOIN sys.x$host_summary_by_statement_latency AS stmt ON accounts.host = stmt.host\n  JOIN sys.x$host_summary_by_file_io AS io ON accounts.host = io.host\n  JOIN sys.x$memory_by_host_by_current_bytes mem ON accounts.host = mem.host\n GROUP BY IF(accounts.host IS NULL, \'background\', accounts.host);
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`accounts`.`HOST` is null,\'background\',`performance_schema`.`accounts`.`HOST`) AS `host`,sum(`stmt`.`total`) AS `statements`,format_pico_time(sum(`stmt`.`total_latency`)) AS `statement_latency`,format_pico_time(ifnull(sum(`stmt`.`total_latency`) / nullif(sum(`stmt`.`total`),0),0)) AS `statement_avg_latency`,sum(`stmt`.`full_scans`) AS `table_scans`,sum(`io`.`ios`) AS `file_ios`,format_pico_time(sum(`io`.`io_latency`)) AS `file_io_latency`,sum(`performance_schema`.`accounts`.`CURRENT_CONNECTIONS`) AS `current_connections`,sum(`performance_schema`.`accounts`.`TOTAL_CONNECTIONS`) AS `total_connections`,count(distinct `performance_schema`.`accounts`.`USER`) AS `unique_users`,`sys`.`format_bytes`(sum(`mem`.`current_allocated`)) AS `current_memory`,`sys`.`format_bytes`(sum(`mem`.`total_allocated`)) AS `total_memory_allocated` from (((`performance_schema`.`accounts` join `sys`.`x$host_summary_by_statement_latency` `stmt` on(`performance_schema`.`accounts`.`HOST` = `stmt`.`host`)) join `sys`.`x$host_summary_by_file_io` `io` on(`performance_schema`.`accounts`.`HOST` = `io`.`host`)) join `sys`.`x$memory_by_host_by_current_bytes` `mem` on(`performance_schema`.`accounts`.`HOST` = `mem`.`host`)) group by if(`performance_schema`.`accounts`.`HOST` is null,\'background\',`performance_schema`.`accounts`.`HOST`)
+mariadb-version=110103
diff --git a/mariadb/sys/host_summary_by_file_io.frm b/mariadb/sys/host_summary_by_file_io.frm
new file mode 100644
index 000000000..7c5b37893
--- /dev/null
+++ b/mariadb/sys/host_summary_by_file_io.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR`) AS `ios`,format_pico_time(sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`)) AS `io_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' group by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=ed2ae963a78a6a2bac61dd22f3cbc4f6
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651215957
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       SUM(count_star) AS ios,\n       format_pico_time(SUM(sum_timer_wait)) AS io_latency\n  FROM performance_schema.events_waits_summary_by_host_by_event_name\n WHERE event_name LIKE \'wait/io/file/%\'\n GROUP BY IF(host IS NULL, \'background\', host)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR`) AS `ios`,format_pico_time(sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`)) AS `io_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' group by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/host_summary_by_file_io_type.frm b/mariadb/sys/host_summary_by_file_io_type.frm
new file mode 100644
index 000000000..1b5a45628
--- /dev/null
+++ b/mariadb/sys/host_summary_by_file_io_type.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` like \'wait/io/file%\' and `performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` > 0 order by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=642fe6a7c3b6108d6b59443fc10c462f
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651024343
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       event_name,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(max_timer_wait) AS max_latency\n  FROM performance_schema.events_waits_summary_by_host_by_event_name\n WHERE event_name LIKE \'wait/io/file%\'\n   AND count_star > 0\n ORDER BY IF(host IS NULL, \'background\', host), sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` like \'wait/io/file%\' and `performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` > 0 order by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/host_summary_by_stages.frm b/mariadb/sys/host_summary_by_stages.frm
new file mode 100644
index 000000000..6ca308373
--- /dev/null
+++ b/mariadb/sys/host_summary_by_stages.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency` from `performance_schema`.`events_stages_summary_by_host_by_event_name` where `performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=338c41d6e3c505c9bbff217479a811f9
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651674241
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       event_name,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(avg_timer_wait) AS avg_latency\n  FROM performance_schema.events_stages_summary_by_host_by_event_name\n WHERE sum_timer_wait != 0\n ORDER BY IF(host IS NULL, \'background\', host), sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency` from `performance_schema`.`events_stages_summary_by_host_by_event_name` where `performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/host_summary_by_statement_latency.frm b/mariadb/sys/host_summary_by_statement_latency.frm
new file mode 100644
index 000000000..4d8e8414e
--- /dev/null
+++ b/mariadb/sys/host_summary_by_statement_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`)) AS `total_latency`,format_pico_time(max(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`)) AS `max_latency`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_LOCK_TIME`)) AS `lock_latency`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_SENT`) AS `rows_sent`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_EXAMINED`) AS `rows_examined`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_AFFECTED`) AS `rows_affected`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_INDEX_USED`) + sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_GOOD_INDEX_USED`) AS `full_scans` from `performance_schema`.`events_statements_summary_by_host_by_event_name` group by if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=41a7ff7a1fc9ad52daba6e441887ef43
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651524393
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       SUM(count_star) AS total,\n       format_pico_time(SUM(sum_timer_wait)) AS total_latency,\n       format_pico_time(MAX(max_timer_wait)) AS max_latency,\n       format_pico_time(SUM(sum_lock_time)) AS lock_latency,\n       SUM(sum_rows_sent) AS rows_sent,\n       SUM(sum_rows_examined) AS rows_examined,\n       SUM(sum_rows_affected) AS rows_affected,\n       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans\n  FROM performance_schema.events_statements_summary_by_host_by_event_name\n GROUP BY IF(host IS NULL, \'background\', host)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`)) AS `total_latency`,format_pico_time(max(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`)) AS `max_latency`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_LOCK_TIME`)) AS `lock_latency`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_SENT`) AS `rows_sent`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_EXAMINED`) AS `rows_examined`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_AFFECTED`) AS `rows_affected`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_INDEX_USED`) + sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_GOOD_INDEX_USED`) AS `full_scans` from `performance_schema`.`events_statements_summary_by_host_by_event_name` group by if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/host_summary_by_statement_type.frm b/mariadb/sys/host_summary_by_statement_type.frm
new file mode 100644
index 000000000..930c101b9
--- /dev/null
+++ b/mariadb/sys/host_summary_by_statement_type.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) AS `host`,substring_index(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`EVENT_NAME`,\'/\',-1) AS `statement`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_LOCK_TIME`) AS `lock_latency`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_EXAMINED` AS `rows_examined`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_AFFECTED` AS `rows_affected`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_INDEX_USED` + `performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_GOOD_INDEX_USED` AS `full_scans` from `performance_schema`.`events_statements_summary_by_host_by_event_name` where `performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=1be13212fa0d3d40dd76ca1dcf43f555
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651365927
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       SUBSTRING_INDEX(event_name, \'/\', -1) AS statement,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(max_timer_wait) AS max_latency,\n       format_pico_time(sum_lock_time) AS lock_latency,\n       sum_rows_sent AS rows_sent,\n       sum_rows_examined AS rows_examined,\n       sum_rows_affected AS rows_affected,\n       sum_no_index_used + sum_no_good_index_used AS full_scans\n  FROM performance_schema.events_statements_summary_by_host_by_event_name\n WHERE sum_timer_wait != 0\n ORDER BY IF(host IS NULL, \'background\', host), sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) AS `host`,substring_index(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`EVENT_NAME`,\'/\',-1) AS `statement`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_LOCK_TIME`) AS `lock_latency`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_EXAMINED` AS `rows_examined`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_AFFECTED` AS `rows_affected`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_INDEX_USED` + `performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_GOOD_INDEX_USED` AS `full_scans` from `performance_schema`.`events_statements_summary_by_host_by_event_name` where `performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/innodb_buffer_stats_by_schema.frm b/mariadb/sys/innodb_buffer_stats_by_schema.frm
new file mode 100644
index 000000000..e7a1b2774
--- /dev/null
+++ b/mariadb/sys/innodb_buffer_stats_by_schema.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) AS `object_schema`,`sys`.`format_bytes`(sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`))) AS `allocated`,`sys`.`format_bytes`(sum(`ibp`.`DATA_SIZE`)) AS `data`,count(`ibp`.`PAGE_NUMBER`) AS `pages`,count(if(`ibp`.`IS_HASHED` = \'YES\',1,NULL)) AS `pages_hashed`,count(if(`ibp`.`IS_OLD` = \'YES\',1,NULL)) AS `pages_old`,round(sum(`ibp`.`NUMBER_RECORDS`) / count(distinct `ibp`.`INDEX_NAME`),0) AS `rows_cached` from `information_schema`.`innodb_buffer_page` `ibp` where `ibp`.`TABLE_NAME` is not null group by if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) order by sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) desc
+md5=178653a8e67a4b42359c7a859d5b8410
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153644890837
+create-version=2
+source=SELECT IF(LOCATE(\'.\', ibp.table_name) = 0, \'InnoDB System\', REPLACE(SUBSTRING_INDEX(ibp.table_name, \'.\', 1), \'`\', \'\')) AS object_schema,\n       sys.format_bytes(SUM(IF(ibp.compressed_size = 0, 16384, compressed_size))) AS allocated,\n       sys.format_bytes(SUM(ibp.data_size)) AS data,\n       COUNT(ibp.page_number) AS pages,\n       COUNT(IF(ibp.is_hashed = \'YES\', 1, NULL)) AS pages_hashed,\n       COUNT(IF(ibp.is_old = \'YES\', 1, NULL)) AS pages_old,\n       ROUND(SUM(ibp.number_records)/COUNT(DISTINCT ibp.index_name)) AS rows_cached\n  FROM information_schema.innodb_buffer_page ibp\n WHERE table_name IS NOT NULL\n GROUP BY object_schema\n ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) AS `object_schema`,`sys`.`format_bytes`(sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`))) AS `allocated`,`sys`.`format_bytes`(sum(`ibp`.`DATA_SIZE`)) AS `data`,count(`ibp`.`PAGE_NUMBER`) AS `pages`,count(if(`ibp`.`IS_HASHED` = \'YES\',1,NULL)) AS `pages_hashed`,count(if(`ibp`.`IS_OLD` = \'YES\',1,NULL)) AS `pages_old`,round(sum(`ibp`.`NUMBER_RECORDS`) / count(distinct `ibp`.`INDEX_NAME`),0) AS `rows_cached` from `information_schema`.`innodb_buffer_page` `ibp` where `ibp`.`TABLE_NAME` is not null group by if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) order by sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) desc
+mariadb-version=110103
diff --git a/mariadb/sys/innodb_buffer_stats_by_table.frm b/mariadb/sys/innodb_buffer_stats_by_table.frm
new file mode 100644
index 000000000..3ce0f7bc2
--- /dev/null
+++ b/mariadb/sys/innodb_buffer_stats_by_table.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) AS `object_schema`,replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',-1),\'`\',\'\') AS `object_name`,`sys`.`format_bytes`(sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`))) AS `allocated`,`sys`.`format_bytes`(sum(`ibp`.`DATA_SIZE`)) AS `data`,count(`ibp`.`PAGE_NUMBER`) AS `pages`,count(if(`ibp`.`IS_HASHED` = \'YES\',1,NULL)) AS `pages_hashed`,count(if(`ibp`.`IS_OLD` = \'YES\',1,NULL)) AS `pages_old`,round(sum(`ibp`.`NUMBER_RECORDS`) / count(distinct `ibp`.`INDEX_NAME`),0) AS `rows_cached` from `information_schema`.`innodb_buffer_page` `ibp` where `ibp`.`TABLE_NAME` is not null group by if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')),replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',-1),\'`\',\'\') order by sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) desc
+md5=5ddd96cfad4a231391cb2ea69bbaea79
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645057421
+create-version=2
+source=SELECT IF(LOCATE(\'.\', ibp.table_name) = 0, \'InnoDB System\', REPLACE(SUBSTRING_INDEX(ibp.table_name, \'.\', 1), \'`\', \'\')) AS object_schema,\n       REPLACE(SUBSTRING_INDEX(ibp.table_name, \'.\', -1), \'`\', \'\') AS object_name,\n       sys.format_bytes(SUM(IF(ibp.compressed_size = 0, 16384, compressed_size))) AS allocated,\n       sys.format_bytes(SUM(ibp.data_size)) AS data,\n       COUNT(ibp.page_number) AS pages,\n       COUNT(IF(ibp.is_hashed = \'YES\', 1, NULL)) AS pages_hashed,\n       COUNT(IF(ibp.is_old = \'YES\', 1, NULL)) AS pages_old,\n       ROUND(SUM(ibp.number_records)/COUNT(DISTINCT ibp.index_name)) AS rows_cached\n  FROM information_schema.innodb_buffer_page ibp\n WHERE table_name IS NOT NULL\n GROUP BY object_schema, object_name\n ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) AS `object_schema`,replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',-1),\'`\',\'\') AS `object_name`,`sys`.`format_bytes`(sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`))) AS `allocated`,`sys`.`format_bytes`(sum(`ibp`.`DATA_SIZE`)) AS `data`,count(`ibp`.`PAGE_NUMBER`) AS `pages`,count(if(`ibp`.`IS_HASHED` = \'YES\',1,NULL)) AS `pages_hashed`,count(if(`ibp`.`IS_OLD` = \'YES\',1,NULL)) AS `pages_old`,round(sum(`ibp`.`NUMBER_RECORDS`) / count(distinct `ibp`.`INDEX_NAME`),0) AS `rows_cached` from `information_schema`.`innodb_buffer_page` `ibp` where `ibp`.`TABLE_NAME` is not null group by if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')),replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',-1),\'`\',\'\') order by sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) desc
+mariadb-version=110103
diff --git a/mariadb/sys/innodb_lock_waits.frm b/mariadb/sys/innodb_lock_waits.frm
new file mode 100644
index 000000000..424cc9a04
--- /dev/null
+++ b/mariadb/sys/innodb_lock_waits.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `r`.`trx_wait_started` AS `wait_started`,timediff(current_timestamp(),`r`.`trx_wait_started`) AS `wait_age`,timestampdiff(SECOND,`r`.`trx_wait_started`,current_timestamp()) AS `wait_age_secs`,`rl`.`lock_table` AS `locked_table`,`rl`.`lock_index` AS `locked_index`,`rl`.`lock_type` AS `locked_type`,`r`.`trx_id` AS `waiting_trx_id`,`r`.`trx_started` AS `waiting_trx_started`,timediff(current_timestamp(),`r`.`trx_started`) AS `waiting_trx_age`,`r`.`trx_rows_locked` AS `waiting_trx_rows_locked`,`r`.`trx_rows_modified` AS `waiting_trx_rows_modified`,`r`.`trx_mysql_thread_id` AS `waiting_pid`,`sys`.`format_statement`(`r`.`trx_query`) AS `waiting_query`,`rl`.`lock_id` AS `waiting_lock_id`,`rl`.`lock_mode` AS `waiting_lock_mode`,`b`.`trx_id` AS `blocking_trx_id`,`b`.`trx_mysql_thread_id` AS `blocking_pid`,`sys`.`format_statement`(`b`.`trx_query`) AS `blocking_query`,`bl`.`lock_id` AS `blocking_lock_id`,`bl`.`lock_mode` AS `blocking_lock_mode`,`b`.`trx_started` AS `blocking_trx_started`,timediff(current_timestamp(),`b`.`trx_started`) AS `blocking_trx_age`,`b`.`trx_rows_locked` AS `blocking_trx_rows_locked`,`b`.`trx_rows_modified` AS `blocking_trx_rows_modified`,concat(\'KILL QUERY \',`b`.`trx_mysql_thread_id`) AS `sql_kill_blocking_query`,concat(\'KILL \',`b`.`trx_mysql_thread_id`) AS `sql_kill_blocking_connection` from ((((`information_schema`.`innodb_lock_waits` `w` join `information_schema`.`innodb_trx` `b` on(`b`.`trx_id` = `w`.`blocking_trx_id`)) join `information_schema`.`innodb_trx` `r` on(`r`.`trx_id` = `w`.`requesting_trx_id`)) join `information_schema`.`innodb_locks` `bl` on(`bl`.`lock_id` = `w`.`blocking_lock_id`)) join `information_schema`.`innodb_locks` `rl` on(`rl`.`lock_id` = `w`.`requested_lock_id`)) order by `r`.`trx_wait_started`
+md5=0fb2774411abbf295a443273d6c9e7c5
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645274182
+create-version=2
+source=SELECT r.trx_wait_started AS wait_started,\n       TIMEDIFF(NOW(), r.trx_wait_started) AS wait_age,\n       TIMESTAMPDIFF(SECOND, r.trx_wait_started, NOW()) AS wait_age_secs,\n       rl.lock_table AS locked_table,\n       rl.lock_index AS locked_index,\n       rl.lock_type AS locked_type,\n       r.trx_id AS waiting_trx_id,\n       r.trx_started as waiting_trx_started,\n       TIMEDIFF(NOW(), r.trx_started) AS waiting_trx_age,\n       r.trx_rows_locked AS waiting_trx_rows_locked,\n       r.trx_rows_modified AS waiting_trx_rows_modified,\n       r.trx_mysql_thread_id AS waiting_pid,\n       sys.format_statement(r.trx_query) AS waiting_query,\n       rl.lock_id AS waiting_lock_id,\n       rl.lock_mode AS waiting_lock_mode,\n       b.trx_id AS blocking_trx_id,\n       b.trx_mysql_thread_id AS blocking_pid,\n       sys.format_statement(b.trx_query) AS blocking_query,\n       bl.lock_id AS blocking_lock_id,\n       bl.lock_mode AS blocking_lock_mode,\n       b.trx_started AS blocking_trx_started,\n       TIMEDIFF(NOW(), b.trx_started) AS blocking_trx_age,\n       b.trx_rows_locked AS blocking_trx_rows_locked,\n       b.trx_rows_modified AS blocking_trx_rows_modified,\n       CONCAT(\'KILL QUERY \', b.trx_mysql_thread_id) AS sql_kill_blocking_query,\n       CONCAT(\'KILL \', b.trx_mysql_thread_id) AS sql_kill_blocking_connection\n  FROM information_schema.innodb_lock_waits w\n       INNER JOIN information_schema.innodb_trx b    ON b.trx_id = w.blocking_trx_id\n       INNER JOIN information_schema.innodb_trx r    ON r.trx_id = w.requesting_trx_id\n       INNER JOIN information_schema.innodb_locks bl ON bl.lock_id = w.blocking_lock_id\n       INNER JOIN information_schema.innodb_locks rl ON rl.lock_id = w.requested_lock_id\n ORDER BY r.trx_wait_started;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `r`.`trx_wait_started` AS `wait_started`,timediff(current_timestamp(),`r`.`trx_wait_started`) AS `wait_age`,timestampdiff(SECOND,`r`.`trx_wait_started`,current_timestamp()) AS `wait_age_secs`,`rl`.`lock_table` AS `locked_table`,`rl`.`lock_index` AS `locked_index`,`rl`.`lock_type` AS `locked_type`,`r`.`trx_id` AS `waiting_trx_id`,`r`.`trx_started` AS `waiting_trx_started`,timediff(current_timestamp(),`r`.`trx_started`) AS `waiting_trx_age`,`r`.`trx_rows_locked` AS `waiting_trx_rows_locked`,`r`.`trx_rows_modified` AS `waiting_trx_rows_modified`,`r`.`trx_mysql_thread_id` AS `waiting_pid`,`sys`.`format_statement`(`r`.`trx_query`) AS `waiting_query`,`rl`.`lock_id` AS `waiting_lock_id`,`rl`.`lock_mode` AS `waiting_lock_mode`,`b`.`trx_id` AS `blocking_trx_id`,`b`.`trx_mysql_thread_id` AS `blocking_pid`,`sys`.`format_statement`(`b`.`trx_query`) AS `blocking_query`,`bl`.`lock_id` AS `blocking_lock_id`,`bl`.`lock_mode` AS `blocking_lock_mode`,`b`.`trx_started` AS `blocking_trx_started`,timediff(current_timestamp(),`b`.`trx_started`) AS `blocking_trx_age`,`b`.`trx_rows_locked` AS `blocking_trx_rows_locked`,`b`.`trx_rows_modified` AS `blocking_trx_rows_modified`,concat(\'KILL QUERY \',`b`.`trx_mysql_thread_id`) AS `sql_kill_blocking_query`,concat(\'KILL \',`b`.`trx_mysql_thread_id`) AS `sql_kill_blocking_connection` from ((((`information_schema`.`innodb_lock_waits` `w` join `information_schema`.`innodb_trx` `b` on(`b`.`trx_id` = `w`.`blocking_trx_id`)) join `information_schema`.`innodb_trx` `r` on(`r`.`trx_id` = `w`.`requesting_trx_id`)) join `information_schema`.`innodb_locks` `bl` on(`bl`.`lock_id` = `w`.`blocking_lock_id`)) join `information_schema`.`innodb_locks` `rl` on(`rl`.`lock_id` = `w`.`requested_lock_id`)) order by `r`.`trx_wait_started`
+mariadb-version=110103
diff --git a/mariadb/sys/io_by_thread_by_latency.frm b/mariadb/sys/io_by_thread_by_latency.frm
new file mode 100644
index 000000000..094b10e09
--- /dev/null
+++ b/mariadb/sys/io_by_thread_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`threads`.`PROCESSLIST_ID` is null,substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),concat(`performance_schema`.`threads`.`PROCESSLIST_USER`,\'@\',`performance_schema`.`threads`.`PROCESSLIST_HOST`)) AS `user`,sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT`)) AS `total_latency`,format_pico_time(min(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`MIN_TIMER_WAIT`)) AS `min_latency`,format_pico_time(avg(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`AVG_TIMER_WAIT`)) AS `avg_latency`,format_pico_time(max(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`MAX_TIMER_WAIT`)) AS `max_latency`,`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID` AS `thread_id`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `processlist_id` from (`performance_schema`.`events_waits_summary_by_thread_by_event_name` left join `performance_schema`.`threads` on(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID` = `performance_schema`.`threads`.`THREAD_ID`)) where `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT` > 0 group by `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID`,`performance_schema`.`threads`.`PROCESSLIST_ID`,if(`performance_schema`.`threads`.`PROCESSLIST_ID` is null,substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),concat(`performance_schema`.`threads`.`PROCESSLIST_USER`,\'@\',`performance_schema`.`threads`.`PROCESSLIST_HOST`)) order by sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=fcc6525c06e21b5428f352f4bfcf37f0
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646124281
+create-version=2
+source=SELECT IF(processlist_id IS NULL,\n             SUBSTRING_INDEX(name, \'/\', -1),\n             CONCAT(processlist_user, \'@\', processlist_host)\n          ) user,\n       SUM(count_star) total,\n       format_pico_time(SUM(sum_timer_wait)) total_latency,\n       format_pico_time(MIN(min_timer_wait)) min_latency,\n       format_pico_time(AVG(avg_timer_wait)) avg_latency,\n       format_pico_time(MAX(max_timer_wait)) max_latency,\n       thread_id,\n       processlist_id\n  FROM performance_schema.events_waits_summary_by_thread_by_event_name\n  LEFT JOIN performance_schema.threads USING (thread_id)\n WHERE event_name LIKE \'wait/io/file/%\'\n   AND sum_timer_wait > 0\n GROUP BY thread_id, processlist_id, user\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`threads`.`PROCESSLIST_ID` is null,substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),concat(`performance_schema`.`threads`.`PROCESSLIST_USER`,\'@\',`performance_schema`.`threads`.`PROCESSLIST_HOST`)) AS `user`,sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT`)) AS `total_latency`,format_pico_time(min(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`MIN_TIMER_WAIT`)) AS `min_latency`,format_pico_time(avg(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`AVG_TIMER_WAIT`)) AS `avg_latency`,format_pico_time(max(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`MAX_TIMER_WAIT`)) AS `max_latency`,`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID` AS `thread_id`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `processlist_id` from (`performance_schema`.`events_waits_summary_by_thread_by_event_name` left join `performance_schema`.`threads` on(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID` = `performance_schema`.`threads`.`THREAD_ID`)) where `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT` > 0 group by `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID`,`performance_schema`.`threads`.`PROCESSLIST_ID`,if(`performance_schema`.`threads`.`PROCESSLIST_ID` is null,substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),concat(`performance_schema`.`threads`.`PROCESSLIST_USER`,\'@\',`performance_schema`.`threads`.`PROCESSLIST_HOST`)) order by sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/io_global_by_file_by_bytes.frm b/mariadb/sys/io_global_by_file_by_bytes.frm
new file mode 100644
index 000000000..28a1eea48
--- /dev/null
+++ b/mariadb/sys/io_global_by_file_by_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sys`.`format_path`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`) AS `file`,`performance_schema`.`file_summary_by_instance`.`COUNT_READ` AS `count_read`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ`) AS `total_read`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_instance`.`COUNT_READ`,0),0)) AS `avg_read`,`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE` AS `count_write`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `total_written`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE`,0),0.00)) AS `avg_write`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `total`,ifnull(round(100 - `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`,0) * 100,2),0.00) AS `write_pct` from `performance_schema`.`file_summary_by_instance` order by `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` desc
+md5=a74849867ba5e2829284aa8d8254bd71
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646274315
+create-version=2
+source=SELECT sys.format_path(file_name) AS file,\n       count_read,\n       sys.format_bytes(sum_number_of_bytes_read) AS total_read,\n       sys.format_bytes(IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0)) AS avg_read,\n       count_write,\n       sys.format_bytes(sum_number_of_bytes_write) AS total_written,\n       sys.format_bytes(IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0.00)) AS avg_write,\n       sys.format_bytes(sum_number_of_bytes_read + sum_number_of_bytes_write) AS total,\n       IFNULL(ROUND(100-((sum_number_of_bytes_read/ NULLIF((sum_number_of_bytes_read+sum_number_of_bytes_write), 0))*100), 2), 0.00) AS write_pct\n  FROM performance_schema.file_summary_by_instance\n ORDER BY sum_number_of_bytes_read + sum_number_of_bytes_write DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sys`.`format_path`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`) AS `file`,`performance_schema`.`file_summary_by_instance`.`COUNT_READ` AS `count_read`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ`) AS `total_read`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_instance`.`COUNT_READ`,0),0)) AS `avg_read`,`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE` AS `count_write`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `total_written`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE`,0),0.00)) AS `avg_write`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `total`,ifnull(round(100 - `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`,0) * 100,2),0.00) AS `write_pct` from `performance_schema`.`file_summary_by_instance` order by `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` desc
+mariadb-version=110103
diff --git a/mariadb/sys/io_global_by_file_by_latency.frm b/mariadb/sys/io_global_by_file_by_latency.frm
new file mode 100644
index 000000000..5114e515d
--- /dev/null
+++ b/mariadb/sys/io_global_by_file_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sys`.`format_path`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`) AS `file`,`performance_schema`.`file_summary_by_instance`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WAIT`) AS `total_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_READ` AS `count_read`,format_pico_time(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_READ`) AS `read_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE` AS `count_write`,format_pico_time(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WRITE`) AS `write_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_MISC` AS `count_misc`,format_pico_time(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_MISC`) AS `misc_latency` from `performance_schema`.`file_summary_by_instance` order by `performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WAIT` desc
+md5=10e6e843da56650b0f41bda3755bf3a5
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646449254
+create-version=2
+source=SELECT sys.format_path(file_name) AS file,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       count_read,\n       format_pico_time(sum_timer_read) AS read_latency,\n       count_write,\n       format_pico_time(sum_timer_write) AS write_latency,\n       count_misc,\n       format_pico_time(sum_timer_misc) AS misc_latency\n  FROM performance_schema.file_summary_by_instance\n ORDER BY sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sys`.`format_path`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`) AS `file`,`performance_schema`.`file_summary_by_instance`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WAIT`) AS `total_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_READ` AS `count_read`,format_pico_time(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_READ`) AS `read_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE` AS `count_write`,format_pico_time(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WRITE`) AS `write_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_MISC` AS `count_misc`,format_pico_time(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_MISC`) AS `misc_latency` from `performance_schema`.`file_summary_by_instance` order by `performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/io_global_by_wait_by_bytes.frm b/mariadb/sys/io_global_by_wait_by_bytes.frm
new file mode 100644
index 000000000..ec297add7
--- /dev/null
+++ b/mariadb/sys/io_global_by_wait_by_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select substring_index(`performance_schema`.`file_summary_by_event_name`.`EVENT_NAME`,\'/\',-2) AS `event_name`,`performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`MIN_TIMER_WAIT`) AS `min_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,`performance_schema`.`file_summary_by_event_name`.`COUNT_READ` AS `count_read`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ`) AS `total_read`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_READ`,0),0)) AS `avg_read`,`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE` AS `count_write`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `total_written`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE`,0),0)) AS `avg_written`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` + `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ`) AS `total_requested` from `performance_schema`.`file_summary_by_event_name` where `performance_schema`.`file_summary_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` > 0 order by `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` + `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` desc
+md5=7d930288769a3b345117191a1542af8e
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646599286
+create-version=2
+source=SELECT SUBSTRING_INDEX(event_name, \'/\', -2) event_name,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(min_timer_wait) AS min_latency,\n       format_pico_time(avg_timer_wait) AS avg_latency,\n       format_pico_time(max_timer_wait) AS max_latency,\n       count_read,\n       sys.format_bytes(sum_number_of_bytes_read) AS total_read,\n       sys.format_bytes(IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0)) AS avg_read,\n       count_write,\n       sys.format_bytes(sum_number_of_bytes_write) AS total_written,\n       sys.format_bytes(IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0)) AS avg_written,\n       sys.format_bytes(sum_number_of_bytes_write + sum_number_of_bytes_read) AS total_requested\n  FROM performance_schema.file_summary_by_event_name\n WHERE event_name LIKE \'wait/io/file/%\'\n   AND count_star > 0\n ORDER BY sum_number_of_bytes_write + sum_number_of_bytes_read DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select substring_index(`performance_schema`.`file_summary_by_event_name`.`EVENT_NAME`,\'/\',-2) AS `event_name`,`performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`MIN_TIMER_WAIT`) AS `min_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,`performance_schema`.`file_summary_by_event_name`.`COUNT_READ` AS `count_read`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ`) AS `total_read`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_READ`,0),0)) AS `avg_read`,`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE` AS `count_write`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `total_written`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE`,0),0)) AS `avg_written`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` + `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ`) AS `total_requested` from `performance_schema`.`file_summary_by_event_name` where `performance_schema`.`file_summary_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` > 0 order by `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` + `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` desc
+mariadb-version=110103
diff --git a/mariadb/sys/io_global_by_wait_by_latency.frm b/mariadb/sys/io_global_by_wait_by_latency.frm
new file mode 100644
index 000000000..0ab9c4ce6
--- /dev/null
+++ b/mariadb/sys/io_global_by_wait_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select substring_index(`performance_schema`.`file_summary_by_event_name`.`EVENT_NAME`,\'/\',-2) AS `event_name`,`performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_READ`) AS `read_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WRITE`) AS `write_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_MISC`) AS `misc_latency`,`performance_schema`.`file_summary_by_event_name`.`COUNT_READ` AS `count_read`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ`) AS `total_read`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_READ`,0),0)) AS `avg_read`,`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE` AS `count_write`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `total_written`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE`,0),0)) AS `avg_written` from `performance_schema`.`file_summary_by_event_name` where `performance_schema`.`file_summary_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` > 0 order by `performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=0272cfa47514b02ded601f6f9cf04fb0
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646749158
+create-version=2
+source=SELECT SUBSTRING_INDEX(event_name, \'/\', -2) AS event_name,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(avg_timer_wait) AS avg_latency,\n       format_pico_time(max_timer_wait) AS max_latency,\n       format_pico_time(sum_timer_read) AS read_latency,\n       format_pico_time(sum_timer_write) AS write_latency,\n       format_pico_time(sum_timer_misc) AS misc_latency,\n       count_read,\n       sys.format_bytes(sum_number_of_bytes_read) AS total_read,\n       sys.format_bytes(IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0)) AS avg_read,\n       count_write,\n       sys.format_bytes(sum_number_of_bytes_write) AS total_written,\n       sys.format_bytes(IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0)) AS avg_written\n  FROM performance_schema.file_summary_by_event_name\n WHERE event_name LIKE \'wait/io/file/%\'\n   AND count_star > 0\n ORDER BY sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select substring_index(`performance_schema`.`file_summary_by_event_name`.`EVENT_NAME`,\'/\',-2) AS `event_name`,`performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_READ`) AS `read_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WRITE`) AS `write_latency`,format_pico_time(`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_MISC`) AS `misc_latency`,`performance_schema`.`file_summary_by_event_name`.`COUNT_READ` AS `count_read`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ`) AS `total_read`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_READ`,0),0)) AS `avg_read`,`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE` AS `count_write`,`sys`.`format_bytes`(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `total_written`,`sys`.`format_bytes`(ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE`,0),0)) AS `avg_written` from `performance_schema`.`file_summary_by_event_name` where `performance_schema`.`file_summary_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` > 0 order by `performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/latest_file_io.frm b/mariadb/sys/latest_file_io.frm
new file mode 100644
index 000000000..b379826c0
--- /dev/null
+++ b/mariadb/sys/latest_file_io.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`information_schema`.`processlist`.`ID` is null,concat(substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),\':\',`performance_schema`.`events_waits_history_long`.`THREAD_ID`),concat(`information_schema`.`processlist`.`USER`,\'@\',`information_schema`.`processlist`.`HOST`,\':\',`information_schema`.`processlist`.`ID`)) AS `thread`,`sys`.`format_path`(`performance_schema`.`events_waits_history_long`.`OBJECT_NAME`) AS `file`,format_pico_time(`performance_schema`.`events_waits_history_long`.`TIMER_WAIT`) AS `latency`,`performance_schema`.`events_waits_history_long`.`OPERATION` AS `operation`,`sys`.`format_bytes`(`performance_schema`.`events_waits_history_long`.`NUMBER_OF_BYTES`) AS `requested` from ((`performance_schema`.`events_waits_history_long` join `performance_schema`.`threads` on(`performance_schema`.`events_waits_history_long`.`THREAD_ID` = `performance_schema`.`threads`.`THREAD_ID`)) left join `information_schema`.`processlist` on(`performance_schema`.`threads`.`PROCESSLIST_ID` = `information_schema`.`processlist`.`ID`)) where `performance_schema`.`events_waits_history_long`.`OBJECT_NAME` is not null and `performance_schema`.`events_waits_history_long`.`EVENT_NAME` like \'wait/io/file/%\' order by `performance_schema`.`events_waits_history_long`.`TIMER_START`
+md5=4f9e863887722ac7347d18738c55e5cb
+updatable=0
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645974296
+create-version=2
+source=SELECT IF(id IS NULL,\n             CONCAT(SUBSTRING_INDEX(name, \'/\', -1), \':\', thread_id),\n             CONCAT(user, \'@\', host, \':\', id)\n          ) thread,\n       sys.format_path(object_name) file,\n       format_pico_time(timer_wait) AS latency,\n       operation,\n       sys.format_bytes(number_of_bytes) AS requested\n  FROM performance_schema.events_waits_history_long\n  JOIN performance_schema.threads USING (thread_id)\n  LEFT JOIN information_schema.processlist ON processlist_id = id\n WHERE object_name IS NOT NULL\n   AND event_name LIKE \'wait/io/file/%\'\n ORDER BY timer_start;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`information_schema`.`processlist`.`ID` is null,concat(substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),\':\',`performance_schema`.`events_waits_history_long`.`THREAD_ID`),concat(`information_schema`.`processlist`.`USER`,\'@\',`information_schema`.`processlist`.`HOST`,\':\',`information_schema`.`processlist`.`ID`)) AS `thread`,`sys`.`format_path`(`performance_schema`.`events_waits_history_long`.`OBJECT_NAME`) AS `file`,format_pico_time(`performance_schema`.`events_waits_history_long`.`TIMER_WAIT`) AS `latency`,`performance_schema`.`events_waits_history_long`.`OPERATION` AS `operation`,`sys`.`format_bytes`(`performance_schema`.`events_waits_history_long`.`NUMBER_OF_BYTES`) AS `requested` from ((`performance_schema`.`events_waits_history_long` join `performance_schema`.`threads` on(`performance_schema`.`events_waits_history_long`.`THREAD_ID` = `performance_schema`.`threads`.`THREAD_ID`)) left join `information_schema`.`processlist` on(`performance_schema`.`threads`.`PROCESSLIST_ID` = `information_schema`.`processlist`.`ID`)) where `performance_schema`.`events_waits_history_long`.`OBJECT_NAME` is not null and `performance_schema`.`events_waits_history_long`.`EVENT_NAME` like \'wait/io/file/%\' order by `performance_schema`.`events_waits_history_long`.`TIMER_START`
+mariadb-version=110103
diff --git a/mariadb/sys/memory_by_host_by_current_bytes.frm b/mariadb/sys/memory_by_host_by_current_bytes.frm
new file mode 100644
index 000000000..618e65d46
--- /dev/null
+++ b/mariadb/sys/memory_by_host_by_current_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_COUNT_USED`) AS `current_count_used`,`sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_allocated`,`sys`.`format_bytes`(ifnull(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_COUNT_USED`),0),0)) AS `current_avg_alloc`,`sys`.`format_bytes`(max(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_max_alloc`,`sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`SUM_NUMBER_OF_BYTES_ALLOC`)) AS `total_allocated` from `performance_schema`.`memory_summary_by_host_by_event_name` group by if(`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+md5=93c91e80e1a600b69b90e1a671a15ed6
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647049187
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       SUM(current_count_used) AS current_count_used,\n       sys.format_bytes(SUM(current_number_of_bytes_used)) AS current_allocated,\n       sys.format_bytes(IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0)) AS current_avg_alloc,\n       sys.format_bytes(MAX(current_number_of_bytes_used)) AS current_max_alloc,\n       sys.format_bytes(SUM(sum_number_of_bytes_alloc)) AS total_allocated\n  FROM performance_schema.memory_summary_by_host_by_event_name\n GROUP BY IF(host IS NULL, \'background\', host)\n ORDER BY SUM(current_number_of_bytes_used) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_COUNT_USED`) AS `current_count_used`,`sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_allocated`,`sys`.`format_bytes`(ifnull(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_COUNT_USED`),0),0)) AS `current_avg_alloc`,`sys`.`format_bytes`(max(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_max_alloc`,`sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`SUM_NUMBER_OF_BYTES_ALLOC`)) AS `total_allocated` from `performance_schema`.`memory_summary_by_host_by_event_name` group by if(`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/memory_by_thread_by_current_bytes.frm b/mariadb/sys/memory_by_thread_by_current_bytes.frm
new file mode 100644
index 000000000..434e67390
--- /dev/null
+++ b/mariadb/sys/memory_by_thread_by_current_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `mt`.`THREAD_ID` AS `thread_id`,if(`t`.`NAME` = \'thread/sql/one_connection\',concat(`t`.`PROCESSLIST_USER`,\'@\',`t`.`PROCESSLIST_HOST`),replace(`t`.`NAME`,\'thread/\',\'\')) AS `user`,sum(`mt`.`CURRENT_COUNT_USED`) AS `current_count_used`,`sys`.`format_bytes`(sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_allocated`,`sys`.`format_bytes`(ifnull(sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`mt`.`CURRENT_COUNT_USED`),0),0)) AS `current_avg_alloc`,`sys`.`format_bytes`(max(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_max_alloc`,`sys`.`format_bytes`(sum(`mt`.`SUM_NUMBER_OF_BYTES_ALLOC`)) AS `total_allocated` from (`performance_schema`.`memory_summary_by_thread_by_event_name` `mt` join `performance_schema`.`threads` `t` on(`mt`.`THREAD_ID` = `t`.`THREAD_ID`)) group by `mt`.`THREAD_ID`,if(`t`.`NAME` = \'thread/sql/one_connection\',concat(`t`.`PROCESSLIST_USER`,\'@\',`t`.`PROCESSLIST_HOST`),replace(`t`.`NAME`,\'thread/\',\'\')) order by sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+md5=bae940445aa2189841198ee54ad4ff09
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647190903
+create-version=2
+source=SELECT thread_id,\n       IF(t.name = \'thread/sql/one_connection\',\n          CONCAT(t.processlist_user, \'@\', t.processlist_host),\n          REPLACE(t.name, \'thread/\', \'\')) user,\n       SUM(mt.current_count_used) AS current_count_used,\n       sys.format_bytes(SUM(mt.current_number_of_bytes_used)) AS current_allocated,\n       sys.format_bytes(IFNULL(SUM(mt.current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0)) AS current_avg_alloc,\n       sys.format_bytes(MAX(mt.current_number_of_bytes_used)) AS current_max_alloc,\n       sys.format_bytes(SUM(mt.sum_number_of_bytes_alloc)) AS total_allocated\n  FROM performance_schema.memory_summary_by_thread_by_event_name AS mt\n  JOIN performance_schema.threads AS t USING (thread_id)\n GROUP BY thread_id, IF(t.name = \'thread/sql/one_connection\',\n          CONCAT(t.processlist_user, \'@\', t.processlist_host),\n          REPLACE(t.name, \'thread/\', \'\'))\n ORDER BY SUM(current_number_of_bytes_used) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `mt`.`THREAD_ID` AS `thread_id`,if(`t`.`NAME` = \'thread/sql/one_connection\',concat(`t`.`PROCESSLIST_USER`,\'@\',`t`.`PROCESSLIST_HOST`),replace(`t`.`NAME`,\'thread/\',\'\')) AS `user`,sum(`mt`.`CURRENT_COUNT_USED`) AS `current_count_used`,`sys`.`format_bytes`(sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_allocated`,`sys`.`format_bytes`(ifnull(sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`mt`.`CURRENT_COUNT_USED`),0),0)) AS `current_avg_alloc`,`sys`.`format_bytes`(max(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_max_alloc`,`sys`.`format_bytes`(sum(`mt`.`SUM_NUMBER_OF_BYTES_ALLOC`)) AS `total_allocated` from (`performance_schema`.`memory_summary_by_thread_by_event_name` `mt` join `performance_schema`.`threads` `t` on(`mt`.`THREAD_ID` = `t`.`THREAD_ID`)) group by `mt`.`THREAD_ID`,if(`t`.`NAME` = \'thread/sql/one_connection\',concat(`t`.`PROCESSLIST_USER`,\'@\',`t`.`PROCESSLIST_HOST`),replace(`t`.`NAME`,\'thread/\',\'\')) order by sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/memory_by_user_by_current_bytes.frm b/mariadb/sys/memory_by_user_by_current_bytes.frm
new file mode 100644
index 000000000..519c29098
--- /dev/null
+++ b/mariadb/sys/memory_by_user_by_current_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`memory_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`memory_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_COUNT_USED`) AS `current_count_used`,`sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_allocated`,`sys`.`format_bytes`(ifnull(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_COUNT_USED`),0),0)) AS `current_avg_alloc`,`sys`.`format_bytes`(max(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_max_alloc`,`sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`SUM_NUMBER_OF_BYTES_ALLOC`)) AS `total_allocated` from `performance_schema`.`memory_summary_by_user_by_event_name` group by if(`performance_schema`.`memory_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`memory_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+md5=f057d6d83c301f761890986ff9b2a9a2
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646899229
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       SUM(current_count_used) AS current_count_used,\n       sys.format_bytes(SUM(current_number_of_bytes_used)) AS current_allocated,\n       sys.format_bytes(IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0)) AS current_avg_alloc,\n       sys.format_bytes(MAX(current_number_of_bytes_used)) AS current_max_alloc,\n       sys.format_bytes(SUM(sum_number_of_bytes_alloc)) AS total_allocated\n  FROM performance_schema.memory_summary_by_user_by_event_name\n GROUP BY IF(user IS NULL, \'background\', user)\n ORDER BY SUM(current_number_of_bytes_used) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`memory_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`memory_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_COUNT_USED`) AS `current_count_used`,`sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_allocated`,`sys`.`format_bytes`(ifnull(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_COUNT_USED`),0),0)) AS `current_avg_alloc`,`sys`.`format_bytes`(max(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `current_max_alloc`,`sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`SUM_NUMBER_OF_BYTES_ALLOC`)) AS `total_allocated` from `performance_schema`.`memory_summary_by_user_by_event_name` group by if(`performance_schema`.`memory_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`memory_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/memory_global_by_current_bytes.frm b/mariadb/sys/memory_global_by_current_bytes.frm
new file mode 100644
index 000000000..387042299
--- /dev/null
+++ b/mariadb/sys/memory_global_by_current_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`memory_summary_global_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_COUNT_USED` AS `current_count`,`sys`.`format_bytes`(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_alloc`,`sys`.`format_bytes`(ifnull(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` / nullif(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_COUNT_USED`,0),0)) AS `current_avg_alloc`,`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_COUNT_USED` AS `high_count`,`sys`.`format_bytes`(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_NUMBER_OF_BYTES_USED`) AS `high_alloc`,`sys`.`format_bytes`(ifnull(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_NUMBER_OF_BYTES_USED` / nullif(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_COUNT_USED`,0),0)) AS `high_avg_alloc` from `performance_schema`.`memory_summary_global_by_event_name` where `performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` > 0 order by `performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` desc
+md5=e5638aa4612faf9c663f68742eb47175
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647357497
+create-version=2
+source=SELECT event_name,\n       current_count_used AS current_count,\n       sys.format_bytes(current_number_of_bytes_used) AS current_alloc,\n       sys.format_bytes(IFNULL(current_number_of_bytes_used / NULLIF(current_count_used, 0), 0)) AS current_avg_alloc,\n       high_count_used AS high_count,\n       sys.format_bytes(high_number_of_bytes_used) AS high_alloc,\n       sys.format_bytes(IFNULL(high_number_of_bytes_used / NULLIF(high_count_used, 0), 0)) AS high_avg_alloc\n  FROM performance_schema.memory_summary_global_by_event_name\n WHERE current_number_of_bytes_used > 0\n ORDER BY current_number_of_bytes_used DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`memory_summary_global_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_COUNT_USED` AS `current_count`,`sys`.`format_bytes`(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_alloc`,`sys`.`format_bytes`(ifnull(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` / nullif(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_COUNT_USED`,0),0)) AS `current_avg_alloc`,`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_COUNT_USED` AS `high_count`,`sys`.`format_bytes`(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_NUMBER_OF_BYTES_USED`) AS `high_alloc`,`sys`.`format_bytes`(ifnull(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_NUMBER_OF_BYTES_USED` / nullif(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_COUNT_USED`,0),0)) AS `high_avg_alloc` from `performance_schema`.`memory_summary_global_by_event_name` where `performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` > 0 order by `performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` desc
+mariadb-version=110103
diff --git a/mariadb/sys/memory_global_total.frm b/mariadb/sys/memory_global_total.frm
new file mode 100644
index 000000000..0b978406a
--- /dev/null
+++ b/mariadb/sys/memory_global_total.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `total_allocated` from `performance_schema`.`memory_summary_global_by_event_name`
+md5=8082fddb38d6165c0d33b88815ddf3d8
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647499171
+create-version=2
+source=SELECT sys.format_bytes(SUM(CURRENT_NUMBER_OF_BYTES_USED)) total_allocated\n  FROM performance_schema.memory_summary_global_by_event_name;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sys`.`format_bytes`(sum(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`)) AS `total_allocated` from `performance_schema`.`memory_summary_global_by_event_name`
+mariadb-version=110103
diff --git a/mariadb/sys/metrics.frm b/mariadb/sys/metrics.frm
new file mode 100644
index 000000000..89eb168e7
--- /dev/null
+++ b/mariadb/sys/metrics.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=(select lcase(`performance_schema`.`global_status`.`VARIABLE_NAME`) AS `Variable_name`,`performance_schema`.`global_status`.`VARIABLE_VALUE` AS `Variable_value`,\'Global Status\' AS `Type`,\'YES\' AS `Enabled` from `performance_schema`.`global_status`) union all (select `information_schema`.`INNODB_METRICS`.`NAME` AS `Variable_name`,`information_schema`.`INNODB_METRICS`.`COUNT` AS `Variable_value`,concat(\'InnoDB Metrics - \',`information_schema`.`INNODB_METRICS`.`SUBSYSTEM`) AS `Type`,\'YES\' AS `Enabled` from `information_schema`.`INNODB_METRICS` where `information_schema`.`INNODB_METRICS`.`NAME` not in (\'lock_row_lock_time\',\'lock_row_lock_time_avg\',\'lock_row_lock_time_max\',\'lock_row_lock_waits\',\'buffer_pool_reads\',\'buffer_pool_read_requests\',\'buffer_pool_write_requests\',\'buffer_pool_wait_free\',\'buffer_pool_read_ahead\',\'buffer_pool_read_ahead_evicted\',\'buffer_pool_pages_total\',\'buffer_pool_pages_misc\',\'buffer_pool_pages_data\',\'buffer_pool_bytes_data\',\'buffer_pool_pages_dirty\',\'buffer_pool_bytes_dirty\',\'buffer_pool_pages_free\',\'buffer_pages_created\',\'buffer_pages_written\',\'buffer_pages_read\',\'buffer_data_reads\',\'buffer_data_written\',\'file_num_open_files\',\'os_log_bytes_written\',\'os_log_fsyncs\',\'os_log_pending_fsyncs\',\'os_log_pending_writes\',\'log_waits\',\'log_write_requests\',\'log_writes\',\'innodb_dblwr_writes\',\'innodb_dblwr_pages_written\',\'innodb_page_size\')) union all (select \'NOW()\' AS `Variable_name`,current_timestamp(3) AS `Variable_value`,\'System Time\' AS `Type`,\'YES\' AS `Enabled`) union all (select \'UNIX_TIMESTAMP()\' AS `Variable_name`,round(unix_timestamp(current_timestamp(3)),3) AS `Variable_value`,\'System Time\' AS `Type`,\'YES\' AS `Enabled`) order by `Type`,`Variable_name`
+md5=1985a0523a55c70bfd300229b6b05d03
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652749298
+create-version=2
+source=(\nSELECT LOWER(VARIABLE_NAME) AS Variable_name, VARIABLE_VALUE AS Variable_value, \'Global Status\' AS Type, \'YES\' AS Enabled\n  FROM performance_schema.global_status\n) UNION ALL (\nSELECT NAME AS Variable_name, COUNT AS Variable_value,\n       CONCAT(\'InnoDB Metrics - \', SUBSYSTEM) AS Type,\n      \'YES\' AS Enabled\n  FROM information_schema.INNODB_METRICS\n WHERE NAME NOT IN (\n     \'lock_row_lock_time\', \'lock_row_lock_time_avg\', \'lock_row_lock_time_max\', \'lock_row_lock_waits\',\n     \'buffer_pool_reads\', \'buffer_pool_read_requests\', \'buffer_pool_write_requests\', \'buffer_pool_wait_free\',\n     \'buffer_pool_read_ahead\', \'buffer_pool_read_ahead_evicted\', \'buffer_pool_pages_total\', \'buffer_pool_pages_misc\',\n     \'buffer_pool_pages_data\', \'buffer_pool_bytes_data\', \'buffer_pool_pages_dirty\', \'buffer_pool_bytes_dirty\',\n     \'buffer_pool_pages_free\', \'buffer_pages_created\', \'buffer_pages_written\', \'buffer_pages_read\',\n     \'buffer_data_reads\', \'buffer_data_written\', \'file_num_open_files\',\n     \'os_log_bytes_written\', \'os_log_fsyncs\', \'os_log_pending_fsyncs\', \'os_log_pending_writes\',\n     \'log_waits\', \'log_write_requests\', \'log_writes\', \'innodb_dblwr_writes\', \'innodb_dblwr_pages_written\', \'innodb_page_size\')\n) \n  UNION ALL (\nSELECT \'NOW()\' AS Variable_name, NOW(3) AS Variable_value, \'System Time\' AS Type, \'YES\' AS Enabled\n) UNION ALL (\nSELECT \'UNIX_TIMESTAMP()\' AS Variable_name, ROUND(UNIX_TIMESTAMP(NOW(3)), 3) AS Variable_value, \'System Time\' AS Type, \'YES\' AS Enabled\n)\n ORDER BY Type, Variable_name;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=(select lcase(`performance_schema`.`global_status`.`VARIABLE_NAME`) AS `Variable_name`,`performance_schema`.`global_status`.`VARIABLE_VALUE` AS `Variable_value`,\'Global Status\' AS `Type`,\'YES\' AS `Enabled` from `performance_schema`.`global_status`) union all (select `information_schema`.`INNODB_METRICS`.`NAME` AS `Variable_name`,`information_schema`.`INNODB_METRICS`.`COUNT` AS `Variable_value`,concat(\'InnoDB Metrics - \',`information_schema`.`INNODB_METRICS`.`SUBSYSTEM`) AS `Type`,\'YES\' AS `Enabled` from `information_schema`.`INNODB_METRICS` where `information_schema`.`INNODB_METRICS`.`NAME` not in (\'lock_row_lock_time\',\'lock_row_lock_time_avg\',\'lock_row_lock_time_max\',\'lock_row_lock_waits\',\'buffer_pool_reads\',\'buffer_pool_read_requests\',\'buffer_pool_write_requests\',\'buffer_pool_wait_free\',\'buffer_pool_read_ahead\',\'buffer_pool_read_ahead_evicted\',\'buffer_pool_pages_total\',\'buffer_pool_pages_misc\',\'buffer_pool_pages_data\',\'buffer_pool_bytes_data\',\'buffer_pool_pages_dirty\',\'buffer_pool_bytes_dirty\',\'buffer_pool_pages_free\',\'buffer_pages_created\',\'buffer_pages_written\',\'buffer_pages_read\',\'buffer_data_reads\',\'buffer_data_written\',\'file_num_open_files\',\'os_log_bytes_written\',\'os_log_fsyncs\',\'os_log_pending_fsyncs\',\'os_log_pending_writes\',\'log_waits\',\'log_write_requests\',\'log_writes\',\'innodb_dblwr_writes\',\'innodb_dblwr_pages_written\',\'innodb_page_size\')) union all (select \'NOW()\' AS `Variable_name`,current_timestamp(3) AS `Variable_value`,\'System Time\' AS `Type`,\'YES\' AS `Enabled`) union all (select \'UNIX_TIMESTAMP()\' AS `Variable_name`,round(unix_timestamp(current_timestamp(3)),3) AS `Variable_value`,\'System Time\' AS `Type`,\'YES\' AS `Enabled`) order by `Type`,`Variable_name`
+mariadb-version=110103
diff --git a/mariadb/sys/processlist.frm b/mariadb/sys/processlist.frm
new file mode 100644
index 000000000..453c89350
--- /dev/null
+++ b/mariadb/sys/processlist.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `pps`.`THREAD_ID` AS `thd_id`,`pps`.`PROCESSLIST_ID` AS `conn_id`,if(`pps`.`NAME` = \'thread/sql/one_connection\',concat(`pps`.`PROCESSLIST_USER`,\'@\',`pps`.`PROCESSLIST_HOST`),replace(`pps`.`NAME`,\'thread/\',\'\')) AS `user`,`pps`.`PROCESSLIST_DB` AS `db`,`pps`.`PROCESSLIST_COMMAND` AS `command`,`pps`.`PROCESSLIST_STATE` AS `state`,`pps`.`PROCESSLIST_TIME` AS `time`,`sys`.`format_statement`(`pps`.`PROCESSLIST_INFO`) AS `current_statement`,if(`esc`.`END_EVENT_ID` is null,format_pico_time(`esc`.`TIMER_WAIT`),NULL) AS `statement_latency`,if(`esc`.`END_EVENT_ID` is null,round(100 * (`estc`.`WORK_COMPLETED` / `estc`.`WORK_ESTIMATED`),2),NULL) AS `progress`,format_pico_time(`esc`.`LOCK_TIME`) AS `lock_latency`,`esc`.`ROWS_EXAMINED` AS `rows_examined`,`esc`.`ROWS_SENT` AS `rows_sent`,`esc`.`ROWS_AFFECTED` AS `rows_affected`,`esc`.`CREATED_TMP_TABLES` AS `tmp_tables`,`esc`.`CREATED_TMP_DISK_TABLES` AS `tmp_disk_tables`,if(`esc`.`NO_GOOD_INDEX_USED` > 0 or `esc`.`NO_INDEX_USED` > 0,\'YES\',\'NO\') AS `full_scan`,if(`esc`.`END_EVENT_ID` is not null,`sys`.`format_statement`(`esc`.`SQL_TEXT`),NULL) AS `last_statement`,if(`esc`.`END_EVENT_ID` is not null,format_pico_time(`esc`.`TIMER_WAIT`),NULL) AS `last_statement_latency`,`sys`.`format_bytes`(`mem`.`current_allocated`) AS `current_memory`,`ewc`.`EVENT_NAME` AS `last_wait`,if(`ewc`.`END_EVENT_ID` is null and `ewc`.`EVENT_NAME` is not null,\'Still Waiting\',format_pico_time(`ewc`.`TIMER_WAIT`)) AS `last_wait_latency`,`ewc`.`SOURCE` AS `source`,format_pico_time(`etc`.`TIMER_WAIT`) AS `trx_latency`,`etc`.`STATE` AS `trx_state`,`etc`.`AUTOCOMMIT` AS `trx_autocommit`,`conattr_pid`.`ATTR_VALUE` AS `pid`,`conattr_progname`.`ATTR_VALUE` AS `program_name` from (((((((`performance_schema`.`threads` `pps` left join `performance_schema`.`events_waits_current` `ewc` on(`pps`.`THREAD_ID` = `ewc`.`THREAD_ID`)) left join `performance_schema`.`events_stages_current` `estc` on(`pps`.`THREAD_ID` = `estc`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `esc` on(`pps`.`THREAD_ID` = `esc`.`THREAD_ID`)) left join `performance_schema`.`events_transactions_current` `etc` on(`pps`.`THREAD_ID` = `etc`.`THREAD_ID`)) left join `sys`.`x$memory_by_thread_by_current_bytes` `mem` on(`pps`.`THREAD_ID` = `mem`.`thread_id`)) left join `performance_schema`.`session_connect_attrs` `conattr_pid` on(`conattr_pid`.`PROCESSLIST_ID` = `pps`.`PROCESSLIST_ID` and `conattr_pid`.`ATTR_NAME` = \'_pid\')) left join `performance_schema`.`session_connect_attrs` `conattr_progname` on(`conattr_progname`.`PROCESSLIST_ID` = `pps`.`PROCESSLIST_ID` and `conattr_progname`.`ATTR_NAME` = \'program_name\')) order by `pps`.`PROCESSLIST_TIME` desc,if(`ewc`.`END_EVENT_ID` is null and `ewc`.`EVENT_NAME` is not null,\'Still Waiting\',format_pico_time(`ewc`.`TIMER_WAIT`)) desc
+md5=83a8094a609aeaecda720b5ff342da2f
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652824626
+create-version=2
+source=SELECT pps.thread_id AS thd_id,\n       pps.processlist_id AS conn_id,\n       IF(pps.name = \'thread/sql/one_connection\',\n          CONCAT(pps.processlist_user, \'@\', pps.processlist_host),\n          REPLACE(pps.name, \'thread/\', \'\')) user,\n       pps.processlist_db AS db,\n       pps.processlist_command AS command,\n       pps.processlist_state AS state,\n       pps.processlist_time AS time,\n       sys.format_statement(pps.processlist_info) AS current_statement,\n       IF(esc.end_event_id IS NULL,\n          format_pico_time(esc.timer_wait),\n          NULL) AS statement_latency,\n       IF(esc.end_event_id IS NULL,\n          ROUND(100 * (estc.work_completed / estc.work_estimated), 2),\n          NULL) AS progress,\n       format_pico_time(esc.lock_time) AS lock_latency,\n       esc.rows_examined AS rows_examined,\n       esc.rows_sent AS rows_sent,\n       esc.rows_affected AS rows_affected,\n       esc.created_tmp_tables AS tmp_tables,\n       esc.created_tmp_disk_tables AS tmp_disk_tables,\n       IF(esc.no_good_index_used > 0 OR esc.no_index_used > 0, \'YES\', \'NO\') AS full_scan,\n       IF(esc.end_event_id IS NOT NULL,\n          sys.format_statement(esc.sql_text),\n          NULL) AS last_statement,\n       IF(esc.end_event_id IS NOT NULL,\n          format_pico_time(esc.timer_wait),\n          NULL) AS last_statement_latency,\n       sys.format_bytes(mem.current_allocated) AS current_memory,\n       ewc.event_name AS last_wait,\n       IF(ewc.end_event_id IS NULL AND ewc.event_name IS NOT NULL,\n          \'Still Waiting\',\n          format_pico_time(ewc.timer_wait)) last_wait_latency,\n       ewc.source,\n       format_pico_time(etc.timer_wait) AS trx_latency,\n       etc.state AS trx_state,\n       etc.autocommit AS trx_autocommit,\n       conattr_pid.attr_value as pid,\n       conattr_progname.attr_value as program_name\n  FROM performance_schema.threads AS pps\n  LEFT JOIN performance_schema.events_waits_current AS ewc USING (thread_id)\n  LEFT JOIN performance_schema.events_stages_current AS estc USING (thread_id)\n  LEFT JOIN performance_schema.events_statements_current AS esc USING (thread_id)\n  LEFT JOIN performance_schema.events_transactions_current AS etc USING (thread_id)\n  LEFT JOIN sys.x$memory_by_thread_by_current_bytes AS mem USING (thread_id)\n  LEFT JOIN performance_schema.session_connect_attrs AS conattr_pid\n    ON conattr_pid.processlist_id=pps.processlist_id and conattr_pid.attr_name=\'_pid\'\n  LEFT JOIN performance_schema.session_connect_attrs AS conattr_progname\n    ON conattr_progname.processlist_id=pps.processlist_id and conattr_progname.attr_name=\'program_name\'\n ORDER BY pps.processlist_time DESC, last_wait_latency DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `pps`.`THREAD_ID` AS `thd_id`,`pps`.`PROCESSLIST_ID` AS `conn_id`,if(`pps`.`NAME` = \'thread/sql/one_connection\',concat(`pps`.`PROCESSLIST_USER`,\'@\',`pps`.`PROCESSLIST_HOST`),replace(`pps`.`NAME`,\'thread/\',\'\')) AS `user`,`pps`.`PROCESSLIST_DB` AS `db`,`pps`.`PROCESSLIST_COMMAND` AS `command`,`pps`.`PROCESSLIST_STATE` AS `state`,`pps`.`PROCESSLIST_TIME` AS `time`,`sys`.`format_statement`(`pps`.`PROCESSLIST_INFO`) AS `current_statement`,if(`esc`.`END_EVENT_ID` is null,format_pico_time(`esc`.`TIMER_WAIT`),NULL) AS `statement_latency`,if(`esc`.`END_EVENT_ID` is null,round(100 * (`estc`.`WORK_COMPLETED` / `estc`.`WORK_ESTIMATED`),2),NULL) AS `progress`,format_pico_time(`esc`.`LOCK_TIME`) AS `lock_latency`,`esc`.`ROWS_EXAMINED` AS `rows_examined`,`esc`.`ROWS_SENT` AS `rows_sent`,`esc`.`ROWS_AFFECTED` AS `rows_affected`,`esc`.`CREATED_TMP_TABLES` AS `tmp_tables`,`esc`.`CREATED_TMP_DISK_TABLES` AS `tmp_disk_tables`,if(`esc`.`NO_GOOD_INDEX_USED` > 0 or `esc`.`NO_INDEX_USED` > 0,\'YES\',\'NO\') AS `full_scan`,if(`esc`.`END_EVENT_ID` is not null,`sys`.`format_statement`(`esc`.`SQL_TEXT`),NULL) AS `last_statement`,if(`esc`.`END_EVENT_ID` is not null,format_pico_time(`esc`.`TIMER_WAIT`),NULL) AS `last_statement_latency`,`sys`.`format_bytes`(`mem`.`current_allocated`) AS `current_memory`,`ewc`.`EVENT_NAME` AS `last_wait`,if(`ewc`.`END_EVENT_ID` is null and `ewc`.`EVENT_NAME` is not null,\'Still Waiting\',format_pico_time(`ewc`.`TIMER_WAIT`)) AS `last_wait_latency`,`ewc`.`SOURCE` AS `source`,format_pico_time(`etc`.`TIMER_WAIT`) AS `trx_latency`,`etc`.`STATE` AS `trx_state`,`etc`.`AUTOCOMMIT` AS `trx_autocommit`,`conattr_pid`.`ATTR_VALUE` AS `pid`,`conattr_progname`.`ATTR_VALUE` AS `program_name` from (((((((`performance_schema`.`threads` `pps` left join `performance_schema`.`events_waits_current` `ewc` on(`pps`.`THREAD_ID` = `ewc`.`THREAD_ID`)) left join `performance_schema`.`events_stages_current` `estc` on(`pps`.`THREAD_ID` = `estc`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `esc` on(`pps`.`THREAD_ID` = `esc`.`THREAD_ID`)) left join `performance_schema`.`events_transactions_current` `etc` on(`pps`.`THREAD_ID` = `etc`.`THREAD_ID`)) left join `sys`.`x$memory_by_thread_by_current_bytes` `mem` on(`pps`.`THREAD_ID` = `mem`.`thread_id`)) left join `performance_schema`.`session_connect_attrs` `conattr_pid` on(`conattr_pid`.`PROCESSLIST_ID` = `pps`.`PROCESSLIST_ID` and `conattr_pid`.`ATTR_NAME` = \'_pid\')) left join `performance_schema`.`session_connect_attrs` `conattr_progname` on(`conattr_progname`.`PROCESSLIST_ID` = `pps`.`PROCESSLIST_ID` and `conattr_progname`.`ATTR_NAME` = \'program_name\')) order by `pps`.`PROCESSLIST_TIME` desc,if(`ewc`.`END_EVENT_ID` is null and `ewc`.`EVENT_NAME` is not null,\'Still Waiting\',format_pico_time(`ewc`.`TIMER_WAIT`)) desc
+mariadb-version=110103
diff --git a/mariadb/sys/ps_check_lost_instrumentation.frm b/mariadb/sys/ps_check_lost_instrumentation.frm
new file mode 100644
index 000000000..cbf395081
--- /dev/null
+++ b/mariadb/sys/ps_check_lost_instrumentation.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`global_status`.`VARIABLE_NAME` AS `variable_name`,`performance_schema`.`global_status`.`VARIABLE_VALUE` AS `variable_value` from `performance_schema`.`global_status` where `performance_schema`.`global_status`.`VARIABLE_NAME` like \'perf%lost\' and `performance_schema`.`global_status`.`VARIABLE_VALUE` > 0
+md5=c734b24ae48c36b59fc217e2407acb24
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645899278
+create-version=2
+source=SELECT variable_name, variable_value\n  FROM performance_schema.global_status\n WHERE variable_name LIKE \'perf%lost\'\n   AND variable_value > 0;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`global_status`.`VARIABLE_NAME` AS `variable_name`,`performance_schema`.`global_status`.`VARIABLE_VALUE` AS `variable_value` from `performance_schema`.`global_status` where `performance_schema`.`global_status`.`VARIABLE_NAME` like \'perf%lost\' and `performance_schema`.`global_status`.`VARIABLE_VALUE` > 0
+mariadb-version=110103
diff --git a/mariadb/sys/schema_auto_increment_columns.frm b/mariadb/sys/schema_auto_increment_columns.frm
new file mode 100644
index 000000000..28a78ef2d
--- /dev/null
+++ b/mariadb/sys/schema_auto_increment_columns.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `information_schema`.`COLUMNS`.`TABLE_SCHEMA` AS `table_schema`,`information_schema`.`COLUMNS`.`TABLE_NAME` AS `table_name`,`information_schema`.`COLUMNS`.`COLUMN_NAME` AS `column_name`,`information_schema`.`COLUMNS`.`DATA_TYPE` AS `data_type`,`information_schema`.`COLUMNS`.`COLUMN_TYPE` AS `column_type`,locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) = 0 AS `is_signed`,locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0 AS `is_unsigned`,case `information_schema`.`COLUMNS`.`DATA_TYPE` when \'tinyint\' then 255 when \'smallint\' then 65535 when \'mediumint\' then 16777215 when \'int\' then 4294967295 when \'bigint\' then 18446744073709551615 end >> if(locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0,0,1) AS `max_value`,`information_schema`.`TABLES`.`AUTO_INCREMENT` AS `auto_increment`,`information_schema`.`TABLES`.`AUTO_INCREMENT` / (case `information_schema`.`COLUMNS`.`DATA_TYPE` when \'tinyint\' then 255 when \'smallint\' then 65535 when \'mediumint\' then 16777215 when \'int\' then 4294967295 when \'bigint\' then 18446744073709551615 end >> if(locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0,0,1)) AS `auto_increment_ratio` from (`INFORMATION_SCHEMA`.`COLUMNS` join `INFORMATION_SCHEMA`.`TABLES` on(`information_schema`.`COLUMNS`.`TABLE_SCHEMA` = `information_schema`.`TABLES`.`TABLE_SCHEMA` and `information_schema`.`COLUMNS`.`TABLE_NAME` = `information_schema`.`TABLES`.`TABLE_NAME`)) where `information_schema`.`COLUMNS`.`TABLE_SCHEMA` not in (\'mysql\',\'sys\',\'INFORMATION_SCHEMA\',\'performance_schema\') and `information_schema`.`TABLES`.`TABLE_TYPE` = \'BASE TABLE\' and `information_schema`.`COLUMNS`.`EXTRA` = \'auto_increment\' order by `information_schema`.`TABLES`.`AUTO_INCREMENT` / (case `information_schema`.`COLUMNS`.`DATA_TYPE` when \'tinyint\' then 255 when \'smallint\' then 65535 when \'mediumint\' then 16777215 when \'int\' then 4294967295 when \'bigint\' then 18446744073709551615 end >> if(locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0,0,1)) desc,case `information_schema`.`COLUMNS`.`DATA_TYPE` when \'tinyint\' then 255 when \'smallint\' then 65535 when \'mediumint\' then 16777215 when \'int\' then 4294967295 when \'bigint\' then 18446744073709551615 end >> if(locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0,0,1)
+md5=ab5e94e312741ae240d3e4c23fb431b6
+updatable=0
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645632546
+create-version=2
+source=SELECT TABLE_SCHEMA,\n       TABLE_NAME,\n       COLUMN_NAME,\n       DATA_TYPE,\n       COLUMN_TYPE,\n       (LOCATE(\'unsigned\', COLUMN_TYPE) = 0) AS is_signed,\n       (LOCATE(\'unsigned\', COLUMN_TYPE) > 0) AS is_unsigned,\n       (\n          CASE DATA_TYPE\n            WHEN \'tinyint\' THEN 255\n            WHEN \'smallint\' THEN 65535\n            WHEN \'mediumint\' THEN 16777215\n            WHEN \'int\' THEN 4294967295\n            WHEN \'bigint\' THEN 18446744073709551615\n          END >> IF(LOCATE(\'unsigned\', COLUMN_TYPE) > 0, 0, 1)\n       ) AS max_value,\n       AUTO_INCREMENT,\n       AUTO_INCREMENT / (\n         CASE DATA_TYPE\n           WHEN \'tinyint\' THEN 255\n           WHEN \'smallint\' THEN 65535\n           WHEN \'mediumint\' THEN 16777215\n           WHEN \'int\' THEN 4294967295\n           WHEN \'bigint\' THEN 18446744073709551615\n         END >> IF(LOCATE(\'unsigned\', COLUMN_TYPE) > 0, 0, 1)\n       ) AS auto_increment_ratio\n  FROM INFORMATION_SCHEMA.COLUMNS\n INNER JOIN INFORMATION_SCHEMA.TABLES USING (TABLE_SCHEMA, TABLE_NAME)\n WHERE TABLE_SCHEMA NOT IN (\'mysql\', \'sys\', \'INFORMATION_SCHEMA\', \'performance_schema\')\n   AND TABLE_TYPE=\'BASE TABLE\'\n   AND EXTRA=\'auto_increment\'\n ORDER BY auto_increment_ratio DESC, max_value;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `information_schema`.`COLUMNS`.`TABLE_SCHEMA` AS `table_schema`,`information_schema`.`COLUMNS`.`TABLE_NAME` AS `table_name`,`information_schema`.`COLUMNS`.`COLUMN_NAME` AS `column_name`,`information_schema`.`COLUMNS`.`DATA_TYPE` AS `data_type`,`information_schema`.`COLUMNS`.`COLUMN_TYPE` AS `column_type`,locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) = 0 AS `is_signed`,locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0 AS `is_unsigned`,case `information_schema`.`COLUMNS`.`DATA_TYPE` when \'tinyint\' then 255 when \'smallint\' then 65535 when \'mediumint\' then 16777215 when \'int\' then 4294967295 when \'bigint\' then 18446744073709551615 end >> if(locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0,0,1) AS `max_value`,`information_schema`.`TABLES`.`AUTO_INCREMENT` AS `auto_increment`,`information_schema`.`TABLES`.`AUTO_INCREMENT` / (case `information_schema`.`COLUMNS`.`DATA_TYPE` when \'tinyint\' then 255 when \'smallint\' then 65535 when \'mediumint\' then 16777215 when \'int\' then 4294967295 when \'bigint\' then 18446744073709551615 end >> if(locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0,0,1)) AS `auto_increment_ratio` from (`INFORMATION_SCHEMA`.`COLUMNS` join `INFORMATION_SCHEMA`.`TABLES` on(`information_schema`.`COLUMNS`.`TABLE_SCHEMA` = `information_schema`.`TABLES`.`TABLE_SCHEMA` and `information_schema`.`COLUMNS`.`TABLE_NAME` = `information_schema`.`TABLES`.`TABLE_NAME`)) where `information_schema`.`COLUMNS`.`TABLE_SCHEMA` not in (\'mysql\',\'sys\',\'INFORMATION_SCHEMA\',\'performance_schema\') and `information_schema`.`TABLES`.`TABLE_TYPE` = \'BASE TABLE\' and `information_schema`.`COLUMNS`.`EXTRA` = \'auto_increment\' order by `information_schema`.`TABLES`.`AUTO_INCREMENT` / (case `information_schema`.`COLUMNS`.`DATA_TYPE` when \'tinyint\' then 255 when \'smallint\' then 65535 when \'mediumint\' then 16777215 when \'int\' then 4294967295 when \'bigint\' then 18446744073709551615 end >> if(locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0,0,1)) desc,case `information_schema`.`COLUMNS`.`DATA_TYPE` when \'tinyint\' then 255 when \'smallint\' then 65535 when \'mediumint\' then 16777215 when \'int\' then 4294967295 when \'bigint\' then 18446744073709551615 end >> if(locate(\'unsigned\',`information_schema`.`COLUMNS`.`COLUMN_TYPE`) > 0,0,1)
+mariadb-version=110103
diff --git a/mariadb/sys/schema_index_statistics.frm b/mariadb/sys/schema_index_statistics.frm
new file mode 100644
index 000000000..fd7640dc8
--- /dev/null
+++ b/mariadb/sys/schema_index_statistics.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `table_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `table_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` AS `index_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_FETCH` AS `rows_selected`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_FETCH`) AS `select_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_INSERT` AS `rows_inserted`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_INSERT`) AS `insert_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_UPDATE` AS `rows_updated`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_UPDATE`) AS `update_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_DELETE` AS `rows_deleted`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_INSERT`) AS `delete_latency` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is not null order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_WAIT` desc
+md5=c638e9eebe6bc7efa5fcb523399685de
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647657409
+create-version=2
+source=SELECT OBJECT_SCHEMA AS table_schema,\n       OBJECT_NAME AS table_name,\n       INDEX_NAME as index_name,\n       COUNT_FETCH AS rows_selected,\n       format_pico_time(SUM_TIMER_FETCH) AS select_latency,\n       COUNT_INSERT AS rows_inserted,\n       format_pico_time(SUM_TIMER_INSERT) AS insert_latency,\n       COUNT_UPDATE AS rows_updated,\n       format_pico_time(SUM_TIMER_UPDATE) AS update_latency,\n       COUNT_DELETE AS rows_deleted,\n       format_pico_time(SUM_TIMER_INSERT) AS delete_latency\n  FROM performance_schema.table_io_waits_summary_by_index_usage\n WHERE index_name IS NOT NULL\n ORDER BY sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `table_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `table_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` AS `index_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_FETCH` AS `rows_selected`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_FETCH`) AS `select_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_INSERT` AS `rows_inserted`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_INSERT`) AS `insert_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_UPDATE` AS `rows_updated`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_UPDATE`) AS `update_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_DELETE` AS `rows_deleted`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_INSERT`) AS `delete_latency` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is not null order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/schema_object_overview.frm b/mariadb/sys/schema_object_overview.frm
new file mode 100644
index 000000000..07df77b26
--- /dev/null
+++ b/mariadb/sys/schema_object_overview.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `information_schema`.`routines`.`ROUTINE_SCHEMA` AS `db`,`information_schema`.`routines`.`ROUTINE_TYPE` AS `object_type`,count(0) AS `count` from `information_schema`.`routines` group by `information_schema`.`routines`.`ROUTINE_SCHEMA`,`information_schema`.`routines`.`ROUTINE_TYPE` union select `information_schema`.`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`information_schema`.`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,count(0) AS `COUNT(*)` from `information_schema`.`tables` group by `information_schema`.`tables`.`TABLE_SCHEMA`,`information_schema`.`tables`.`TABLE_TYPE` union select `information_schema`.`statistics`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,concat(\'INDEX (\',`information_schema`.`statistics`.`INDEX_TYPE`,\')\') AS `CONCAT(\'INDEX (\', INDEX_TYPE, \')\')`,count(0) AS `COUNT(*)` from `information_schema`.`statistics` group by `information_schema`.`statistics`.`TABLE_SCHEMA`,`information_schema`.`statistics`.`INDEX_TYPE` union select `information_schema`.`triggers`.`TRIGGER_SCHEMA` AS `TRIGGER_SCHEMA`,\'TRIGGER\' AS `TRIGGER`,count(0) AS `COUNT(*)` from `information_schema`.`triggers` group by `information_schema`.`triggers`.`TRIGGER_SCHEMA` union select `information_schema`.`events`.`EVENT_SCHEMA` AS `EVENT_SCHEMA`,\'EVENT\' AS `EVENT`,count(0) AS `COUNT(*)` from `information_schema`.`events` group by `information_schema`.`events`.`EVENT_SCHEMA` order by `db`,`object_type`
+md5=be1e4ce9f5bcd017616670d43bbce5ae
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645473829
+create-version=2
+source=SELECT ROUTINE_SCHEMA AS db, ROUTINE_TYPE AS object_type, COUNT(*) AS count FROM information_schema.routines GROUP BY ROUTINE_SCHEMA, ROUTINE_TYPE\n UNION\nSELECT TABLE_SCHEMA, TABLE_TYPE, COUNT(*) FROM information_schema.tables GROUP BY TABLE_SCHEMA, TABLE_TYPE\n UNION\nSELECT TABLE_SCHEMA, CONCAT(\'INDEX (\', INDEX_TYPE, \')\'), COUNT(*) FROM information_schema.statistics GROUP BY TABLE_SCHEMA, INDEX_TYPE\n UNION\nSELECT TRIGGER_SCHEMA, \'TRIGGER\', COUNT(*) FROM information_schema.triggers GROUP BY TRIGGER_SCHEMA\n UNION\nSELECT EVENT_SCHEMA, \'EVENT\', COUNT(*) FROM information_schema.events GROUP BY EVENT_SCHEMA\nORDER BY DB, OBJECT_TYPE;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `information_schema`.`routines`.`ROUTINE_SCHEMA` AS `db`,`information_schema`.`routines`.`ROUTINE_TYPE` AS `object_type`,count(0) AS `count` from `information_schema`.`routines` group by `information_schema`.`routines`.`ROUTINE_SCHEMA`,`information_schema`.`routines`.`ROUTINE_TYPE` union select `information_schema`.`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`information_schema`.`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,count(0) AS `COUNT(*)` from `information_schema`.`tables` group by `information_schema`.`tables`.`TABLE_SCHEMA`,`information_schema`.`tables`.`TABLE_TYPE` union select `information_schema`.`statistics`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,concat(\'INDEX (\',`information_schema`.`statistics`.`INDEX_TYPE`,\')\') AS `CONCAT(\'INDEX (\', INDEX_TYPE, \')\')`,count(0) AS `COUNT(*)` from `information_schema`.`statistics` group by `information_schema`.`statistics`.`TABLE_SCHEMA`,`information_schema`.`statistics`.`INDEX_TYPE` union select `information_schema`.`triggers`.`TRIGGER_SCHEMA` AS `TRIGGER_SCHEMA`,\'TRIGGER\' AS `TRIGGER`,count(0) AS `COUNT(*)` from `information_schema`.`triggers` group by `information_schema`.`triggers`.`TRIGGER_SCHEMA` union select `information_schema`.`events`.`EVENT_SCHEMA` AS `EVENT_SCHEMA`,\'EVENT\' AS `EVENT`,count(0) AS `COUNT(*)` from `information_schema`.`events` group by `information_schema`.`events`.`EVENT_SCHEMA` order by `db`,`object_type`
+mariadb-version=110103
diff --git a/mariadb/sys/schema_redundant_indexes.frm b/mariadb/sys/schema_redundant_indexes.frm
new file mode 100644
index 000000000..c92132513
--- /dev/null
+++ b/mariadb/sys/schema_redundant_indexes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `redundant_keys`.`table_schema` AS `table_schema`,`redundant_keys`.`table_name` AS `table_name`,`redundant_keys`.`index_name` AS `redundant_index_name`,`redundant_keys`.`index_columns` AS `redundant_index_columns`,`redundant_keys`.`non_unique` AS `redundant_index_non_unique`,`dominant_keys`.`index_name` AS `dominant_index_name`,`dominant_keys`.`index_columns` AS `dominant_index_columns`,`dominant_keys`.`non_unique` AS `dominant_index_non_unique`,if(`redundant_keys`.`subpart_exists` <> 0 or `dominant_keys`.`subpart_exists` <> 0,1,0) AS `subpart_exists`,concat(\'ALTER TABLE `\',`redundant_keys`.`table_schema`,\'`.`\',`redundant_keys`.`table_name`,\'` DROP INDEX `\',`redundant_keys`.`index_name`,\'`\') AS `sql_drop_index` from (`sys`.`x$schema_flattened_keys` `redundant_keys` join `sys`.`x$schema_flattened_keys` `dominant_keys` on(`redundant_keys`.`table_schema` = `dominant_keys`.`table_schema` and `redundant_keys`.`table_name` = `dominant_keys`.`table_name`)) where `redundant_keys`.`index_name` <> `dominant_keys`.`index_name` and (`redundant_keys`.`index_columns` = `dominant_keys`.`index_columns` and (`redundant_keys`.`non_unique` > `dominant_keys`.`non_unique` or `redundant_keys`.`non_unique` = `dominant_keys`.`non_unique` and if(`redundant_keys`.`index_name` = \'PRIMARY\',\'\',`redundant_keys`.`index_name`) > if(`dominant_keys`.`index_name` = \'PRIMARY\',\'\',`dominant_keys`.`index_name`)) or locate(concat(`redundant_keys`.`index_columns`,\',\'),`dominant_keys`.`index_columns`) = 1 and `redundant_keys`.`non_unique` = 1 or locate(concat(`dominant_keys`.`index_columns`,\',\'),`redundant_keys`.`index_columns`) = 1 and `dominant_keys`.`non_unique` = 0)
+md5=b7dc42e5df448cf4a08d3059e8ecf40f
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645815940
+create-version=2
+source=SELECT\n    redundant_keys.table_schema,\n    redundant_keys.table_name,\n    redundant_keys.index_name AS redundant_index_name,\n    redundant_keys.index_columns AS redundant_index_columns,\n    redundant_keys.non_unique AS redundant_index_non_unique,\n    dominant_keys.index_name AS dominant_index_name,\n    dominant_keys.index_columns AS dominant_index_columns,\n    dominant_keys.non_unique AS dominant_index_non_unique,\n    IF(redundant_keys.subpart_exists OR dominant_keys.subpart_exists, 1 ,0) AS subpart_exists,\n    CONCAT(\n      \'ALTER TABLE `\', redundant_keys.table_schema, \'`.`\', redundant_keys.table_name, \'` DROP INDEX `\', redundant_keys.index_name, \'`\'\n      ) AS sql_drop_index\n  FROM\n    x$schema_flattened_keys AS redundant_keys\n    INNER JOIN x$schema_flattened_keys AS dominant_keys\n    USING (TABLE_SCHEMA, TABLE_NAME)\n  WHERE\n    redundant_keys.index_name != dominant_keys.index_name\n    AND (\n      (\n        /* Identical columns */\n        (redundant_keys.index_columns = dominant_keys.index_columns)\n        AND (\n          (redundant_keys.non_unique > dominant_keys.non_unique)\n          OR (redundant_keys.non_unique = dominant_keys.non_unique\n          	AND IF(redundant_keys.index_name=\'PRIMARY\', \'\', redundant_keys.index_name) > IF(dominant_keys.index_name=\'PRIMARY\', \'\', dominant_keys.index_name)\n          )\n        )\n      )\n      OR\n      (\n        /* Non-unique prefix columns */\n        LOCATE(CONCAT(redundant_keys.index_columns, \',\'), dominant_keys.index_columns) = 1\n        AND redundant_keys.non_unique = 1\n      )\n      OR\n      (\n        /* Unique prefix columns */\n        LOCATE(CONCAT(dominant_keys.index_columns, \',\'), redundant_keys.index_columns) = 1\n        AND dominant_keys.non_unique = 0\n      )\n    );
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `redundant_keys`.`table_schema` AS `table_schema`,`redundant_keys`.`table_name` AS `table_name`,`redundant_keys`.`index_name` AS `redundant_index_name`,`redundant_keys`.`index_columns` AS `redundant_index_columns`,`redundant_keys`.`non_unique` AS `redundant_index_non_unique`,`dominant_keys`.`index_name` AS `dominant_index_name`,`dominant_keys`.`index_columns` AS `dominant_index_columns`,`dominant_keys`.`non_unique` AS `dominant_index_non_unique`,if(`redundant_keys`.`subpart_exists` <> 0 or `dominant_keys`.`subpart_exists` <> 0,1,0) AS `subpart_exists`,concat(\'ALTER TABLE `\',`redundant_keys`.`table_schema`,\'`.`\',`redundant_keys`.`table_name`,\'` DROP INDEX `\',`redundant_keys`.`index_name`,\'`\') AS `sql_drop_index` from (`sys`.`x$schema_flattened_keys` `redundant_keys` join `sys`.`x$schema_flattened_keys` `dominant_keys` on(`redundant_keys`.`table_schema` = `dominant_keys`.`table_schema` and `redundant_keys`.`table_name` = `dominant_keys`.`table_name`)) where `redundant_keys`.`index_name` <> `dominant_keys`.`index_name` and (`redundant_keys`.`index_columns` = `dominant_keys`.`index_columns` and (`redundant_keys`.`non_unique` > `dominant_keys`.`non_unique` or `redundant_keys`.`non_unique` = `dominant_keys`.`non_unique` and if(`redundant_keys`.`index_name` = \'PRIMARY\',\'\',`redundant_keys`.`index_name`) > if(`dominant_keys`.`index_name` = \'PRIMARY\',\'\',`dominant_keys`.`index_name`)) or locate(concat(`redundant_keys`.`index_columns`,\',\'),`dominant_keys`.`index_columns`) = 1 and `redundant_keys`.`non_unique` = 1 or locate(concat(`dominant_keys`.`index_columns`,\',\'),`redundant_keys`.`index_columns`) = 1 and `dominant_keys`.`non_unique` = 0)
+mariadb-version=110103
diff --git a/mariadb/sys/schema_table_lock_waits.frm b/mariadb/sys/schema_table_lock_waits.frm
new file mode 100644
index 000000000..8db46e8f4
--- /dev/null
+++ b/mariadb/sys/schema_table_lock_waits.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `g`.`OBJECT_SCHEMA` AS `object_schema`,`g`.`OBJECT_NAME` AS `object_name`,`pt`.`THREAD_ID` AS `waiting_thread_id`,`pt`.`PROCESSLIST_ID` AS `waiting_pid`,`sys`.`ps_thread_account`(`p`.`OWNER_THREAD_ID`) AS `waiting_account`,`p`.`LOCK_TYPE` AS `waiting_lock_type`,`p`.`LOCK_DURATION` AS `waiting_lock_duration`,`sys`.`format_statement`(`pt`.`PROCESSLIST_INFO`) AS `waiting_query`,`pt`.`PROCESSLIST_TIME` AS `waiting_query_secs`,`ps`.`ROWS_AFFECTED` AS `waiting_query_rows_affected`,`ps`.`ROWS_EXAMINED` AS `waiting_query_rows_examined`,`gt`.`THREAD_ID` AS `blocking_thread_id`,`gt`.`PROCESSLIST_ID` AS `blocking_pid`,`sys`.`ps_thread_account`(`g`.`OWNER_THREAD_ID`) AS `blocking_account`,`g`.`LOCK_TYPE` AS `blocking_lock_type`,`g`.`LOCK_DURATION` AS `blocking_lock_duration`,concat(\'KILL QUERY \',`gt`.`PROCESSLIST_ID`) AS `sql_kill_blocking_query`,concat(\'KILL \',`gt`.`PROCESSLIST_ID`) AS `sql_kill_blocking_connection` from (((((`performance_schema`.`metadata_locks` `g` join `performance_schema`.`metadata_locks` `p` on(`g`.`OBJECT_TYPE` = `p`.`OBJECT_TYPE` and `g`.`OBJECT_SCHEMA` = `p`.`OBJECT_SCHEMA` and `g`.`OBJECT_NAME` = `p`.`OBJECT_NAME` and `g`.`LOCK_STATUS` = \'GRANTED\' and `p`.`LOCK_STATUS` = \'PENDING\')) join `performance_schema`.`threads` `gt` on(`g`.`OWNER_THREAD_ID` = `gt`.`THREAD_ID`)) join `performance_schema`.`threads` `pt` on(`p`.`OWNER_THREAD_ID` = `pt`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `gs` on(`g`.`OWNER_THREAD_ID` = `gs`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `ps` on(`p`.`OWNER_THREAD_ID` = `ps`.`THREAD_ID`)) where `g`.`OBJECT_TYPE` = \'TABLE\'
+md5=0e529ab6c702966e113a44dea76f5a90
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648432649
+create-version=2
+source=SELECT g.object_schema AS object_schema,\n       g.object_name AS object_name,\n       pt.thread_id AS waiting_thread_id,\n       pt.processlist_id AS waiting_pid,\n       sys.ps_thread_account(p.owner_thread_id) AS waiting_account,\n       p.lock_type AS waiting_lock_type,\n       p.lock_duration AS waiting_lock_duration,\n       sys.format_statement(pt.processlist_info) AS waiting_query,\n       pt.processlist_time AS waiting_query_secs,\n       ps.rows_affected AS waiting_query_rows_affected,\n       ps.rows_examined AS waiting_query_rows_examined,\n       gt.thread_id AS blocking_thread_id,\n       gt.processlist_id AS blocking_pid,\n       sys.ps_thread_account(g.owner_thread_id) AS blocking_account,\n       g.lock_type AS blocking_lock_type,\n       g.lock_duration AS blocking_lock_duration,\n       CONCAT(\'KILL QUERY \', gt.processlist_id) AS sql_kill_blocking_query,\n       CONCAT(\'KILL \', gt.processlist_id) AS sql_kill_blocking_connection\n  FROM performance_schema.metadata_locks g\n INNER JOIN performance_schema.metadata_locks p\n    ON g.object_type = p.object_type\n   AND g.object_schema = p.object_schema\n   AND g.object_name = p.object_name\n   AND g.lock_status = \'GRANTED\'\n   AND p.lock_status = \'PENDING\'\n INNER JOIN performance_schema.threads gt ON g.owner_thread_id = gt.thread_id\n INNER JOIN performance_schema.threads pt ON p.owner_thread_id = pt.thread_id\n  LEFT JOIN performance_schema.events_statements_current gs ON g.owner_thread_id = gs.thread_id\n  LEFT JOIN performance_schema.events_statements_current ps ON p.owner_thread_id = ps.thread_id\n WHERE g.object_type = \'TABLE\';
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `g`.`OBJECT_SCHEMA` AS `object_schema`,`g`.`OBJECT_NAME` AS `object_name`,`pt`.`THREAD_ID` AS `waiting_thread_id`,`pt`.`PROCESSLIST_ID` AS `waiting_pid`,`sys`.`ps_thread_account`(`p`.`OWNER_THREAD_ID`) AS `waiting_account`,`p`.`LOCK_TYPE` AS `waiting_lock_type`,`p`.`LOCK_DURATION` AS `waiting_lock_duration`,`sys`.`format_statement`(`pt`.`PROCESSLIST_INFO`) AS `waiting_query`,`pt`.`PROCESSLIST_TIME` AS `waiting_query_secs`,`ps`.`ROWS_AFFECTED` AS `waiting_query_rows_affected`,`ps`.`ROWS_EXAMINED` AS `waiting_query_rows_examined`,`gt`.`THREAD_ID` AS `blocking_thread_id`,`gt`.`PROCESSLIST_ID` AS `blocking_pid`,`sys`.`ps_thread_account`(`g`.`OWNER_THREAD_ID`) AS `blocking_account`,`g`.`LOCK_TYPE` AS `blocking_lock_type`,`g`.`LOCK_DURATION` AS `blocking_lock_duration`,concat(\'KILL QUERY \',`gt`.`PROCESSLIST_ID`) AS `sql_kill_blocking_query`,concat(\'KILL \',`gt`.`PROCESSLIST_ID`) AS `sql_kill_blocking_connection` from (((((`performance_schema`.`metadata_locks` `g` join `performance_schema`.`metadata_locks` `p` on(`g`.`OBJECT_TYPE` = `p`.`OBJECT_TYPE` and `g`.`OBJECT_SCHEMA` = `p`.`OBJECT_SCHEMA` and `g`.`OBJECT_NAME` = `p`.`OBJECT_NAME` and `g`.`LOCK_STATUS` = \'GRANTED\' and `p`.`LOCK_STATUS` = \'PENDING\')) join `performance_schema`.`threads` `gt` on(`g`.`OWNER_THREAD_ID` = `gt`.`THREAD_ID`)) join `performance_schema`.`threads` `pt` on(`p`.`OWNER_THREAD_ID` = `pt`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `gs` on(`g`.`OWNER_THREAD_ID` = `gs`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `ps` on(`p`.`OWNER_THREAD_ID` = `ps`.`THREAD_ID`)) where `g`.`OBJECT_TYPE` = \'TABLE\'
+mariadb-version=110103
diff --git a/mariadb/sys/schema_table_statistics.frm b/mariadb/sys/schema_table_statistics.frm
new file mode 100644
index 000000000..81ea4f75e
--- /dev/null
+++ b/mariadb/sys/schema_table_statistics.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `pst`.`OBJECT_SCHEMA` AS `table_schema`,`pst`.`OBJECT_NAME` AS `table_name`,format_pico_time(`pst`.`SUM_TIMER_WAIT`) AS `total_latency`,`pst`.`COUNT_FETCH` AS `rows_fetched`,format_pico_time(`pst`.`SUM_TIMER_FETCH`) AS `fetch_latency`,`pst`.`COUNT_INSERT` AS `rows_inserted`,format_pico_time(`pst`.`SUM_TIMER_INSERT`) AS `insert_latency`,`pst`.`COUNT_UPDATE` AS `rows_updated`,format_pico_time(`pst`.`SUM_TIMER_UPDATE`) AS `update_latency`,`pst`.`COUNT_DELETE` AS `rows_deleted`,format_pico_time(`pst`.`SUM_TIMER_DELETE`) AS `delete_latency`,`fsbi`.`count_read` AS `io_read_requests`,`sys`.`format_bytes`(`fsbi`.`sum_number_of_bytes_read`) AS `io_read`,format_pico_time(`fsbi`.`sum_timer_read`) AS `io_read_latency`,`fsbi`.`count_write` AS `io_write_requests`,`sys`.`format_bytes`(`fsbi`.`sum_number_of_bytes_write`) AS `io_write`,format_pico_time(`fsbi`.`sum_timer_write`) AS `io_write_latency`,`fsbi`.`count_misc` AS `io_misc_requests`,format_pico_time(`fsbi`.`sum_timer_misc`) AS `io_misc_latency` from (`performance_schema`.`table_io_waits_summary_by_table` `pst` left join `sys`.`x$ps_schema_table_statistics_io` `fsbi` on(`pst`.`OBJECT_SCHEMA` = `fsbi`.`table_schema` and `pst`.`OBJECT_NAME` = `fsbi`.`table_name`)) order by `pst`.`SUM_TIMER_WAIT` desc
+md5=74a7b27f66a13611050e4ea8186510b4
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647882459
+create-version=2
+source=SELECT pst.object_schema AS table_schema,\n       pst.object_name AS table_name,\n       format_pico_time(pst.sum_timer_wait) AS total_latency,\n       pst.count_fetch AS rows_fetched,\n       format_pico_time(pst.sum_timer_fetch) AS fetch_latency,\n       pst.count_insert AS rows_inserted,\n       format_pico_time(pst.sum_timer_insert) AS insert_latency,\n       pst.count_update AS rows_updated,\n       format_pico_time(pst.sum_timer_update) AS update_latency,\n       pst.count_delete AS rows_deleted,\n       format_pico_time(pst.sum_timer_delete) AS delete_latency,\n       fsbi.count_read AS io_read_requests,\n       sys.format_bytes(fsbi.sum_number_of_bytes_read) AS io_read,\n       format_pico_time(fsbi.sum_timer_read) AS io_read_latency,\n       fsbi.count_write AS io_write_requests,\n       sys.format_bytes(fsbi.sum_number_of_bytes_write) AS io_write,\n       format_pico_time(fsbi.sum_timer_write) AS io_write_latency,\n       fsbi.count_misc AS io_misc_requests,\n       format_pico_time(fsbi.sum_timer_misc) AS io_misc_latency\n  FROM performance_schema.table_io_waits_summary_by_table AS pst\n  LEFT JOIN x$ps_schema_table_statistics_io AS fsbi\n    ON pst.object_schema = fsbi.table_schema\n   AND pst.object_name = fsbi.table_name\n ORDER BY pst.sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `pst`.`OBJECT_SCHEMA` AS `table_schema`,`pst`.`OBJECT_NAME` AS `table_name`,format_pico_time(`pst`.`SUM_TIMER_WAIT`) AS `total_latency`,`pst`.`COUNT_FETCH` AS `rows_fetched`,format_pico_time(`pst`.`SUM_TIMER_FETCH`) AS `fetch_latency`,`pst`.`COUNT_INSERT` AS `rows_inserted`,format_pico_time(`pst`.`SUM_TIMER_INSERT`) AS `insert_latency`,`pst`.`COUNT_UPDATE` AS `rows_updated`,format_pico_time(`pst`.`SUM_TIMER_UPDATE`) AS `update_latency`,`pst`.`COUNT_DELETE` AS `rows_deleted`,format_pico_time(`pst`.`SUM_TIMER_DELETE`) AS `delete_latency`,`fsbi`.`count_read` AS `io_read_requests`,`sys`.`format_bytes`(`fsbi`.`sum_number_of_bytes_read`) AS `io_read`,format_pico_time(`fsbi`.`sum_timer_read`) AS `io_read_latency`,`fsbi`.`count_write` AS `io_write_requests`,`sys`.`format_bytes`(`fsbi`.`sum_number_of_bytes_write`) AS `io_write`,format_pico_time(`fsbi`.`sum_timer_write`) AS `io_write_latency`,`fsbi`.`count_misc` AS `io_misc_requests`,format_pico_time(`fsbi`.`sum_timer_misc`) AS `io_misc_latency` from (`performance_schema`.`table_io_waits_summary_by_table` `pst` left join `sys`.`x$ps_schema_table_statistics_io` `fsbi` on(`pst`.`OBJECT_SCHEMA` = `fsbi`.`table_schema` and `pst`.`OBJECT_NAME` = `fsbi`.`table_name`)) order by `pst`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/schema_table_statistics_with_buffer.frm b/mariadb/sys/schema_table_statistics_with_buffer.frm
new file mode 100644
index 000000000..7eacef625
--- /dev/null
+++ b/mariadb/sys/schema_table_statistics_with_buffer.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `pst`.`OBJECT_SCHEMA` AS `table_schema`,`pst`.`OBJECT_NAME` AS `table_name`,`pst`.`COUNT_FETCH` AS `rows_fetched`,format_pico_time(`pst`.`SUM_TIMER_FETCH`) AS `fetch_latency`,`pst`.`COUNT_INSERT` AS `rows_inserted`,format_pico_time(`pst`.`SUM_TIMER_INSERT`) AS `insert_latency`,`pst`.`COUNT_UPDATE` AS `rows_updated`,format_pico_time(`pst`.`SUM_TIMER_UPDATE`) AS `update_latency`,`pst`.`COUNT_DELETE` AS `rows_deleted`,format_pico_time(`pst`.`SUM_TIMER_DELETE`) AS `delete_latency`,`fsbi`.`count_read` AS `io_read_requests`,`sys`.`format_bytes`(`fsbi`.`sum_number_of_bytes_read`) AS `io_read`,format_pico_time(`fsbi`.`sum_timer_read`) AS `io_read_latency`,`fsbi`.`count_write` AS `io_write_requests`,`sys`.`format_bytes`(`fsbi`.`sum_number_of_bytes_write`) AS `io_write`,format_pico_time(`fsbi`.`sum_timer_write`) AS `io_write_latency`,`fsbi`.`count_misc` AS `io_misc_requests`,format_pico_time(`fsbi`.`sum_timer_misc`) AS `io_misc_latency`,`sys`.`format_bytes`(`ibp`.`allocated`) AS `innodb_buffer_allocated`,`sys`.`format_bytes`(`ibp`.`data`) AS `innodb_buffer_data`,`sys`.`format_bytes`(`ibp`.`allocated` - `ibp`.`data`) AS `innodb_buffer_free`,`ibp`.`pages` AS `innodb_buffer_pages`,`ibp`.`pages_hashed` AS `innodb_buffer_pages_hashed`,`ibp`.`pages_old` AS `innodb_buffer_pages_old`,`ibp`.`rows_cached` AS `innodb_buffer_rows_cached` from ((`performance_schema`.`table_io_waits_summary_by_table` `pst` left join `sys`.`x$ps_schema_table_statistics_io` `fsbi` on(`pst`.`OBJECT_SCHEMA` = `fsbi`.`table_schema` and `pst`.`OBJECT_NAME` = `fsbi`.`table_name`)) left join `sys`.`x$innodb_buffer_stats_by_table` `ibp` on(`pst`.`OBJECT_SCHEMA` = `ibp`.`object_schema` and `pst`.`OBJECT_NAME` = `ibp`.`object_name`)) order by `pst`.`SUM_TIMER_WAIT` desc
+md5=babe17622733f781733c5d9063af3aaf
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648032591
+create-version=2
+source=SELECT pst.object_schema AS table_schema,\n       pst.object_name AS table_name,\n       pst.count_fetch AS rows_fetched,\n       format_pico_time(pst.sum_timer_fetch) AS fetch_latency,\n       pst.count_insert AS rows_inserted,\n       format_pico_time(pst.sum_timer_insert) AS insert_latency,\n       pst.count_update AS rows_updated,\n       format_pico_time(pst.sum_timer_update) AS update_latency,\n       pst.count_delete AS rows_deleted,\n       format_pico_time(pst.sum_timer_delete) AS delete_latency,\n       fsbi.count_read AS io_read_requests,\n       sys.format_bytes(fsbi.sum_number_of_bytes_read) AS io_read,\n       format_pico_time(fsbi.sum_timer_read) AS io_read_latency,\n       fsbi.count_write AS io_write_requests,\n       sys.format_bytes(fsbi.sum_number_of_bytes_write) AS io_write,\n       format_pico_time(fsbi.sum_timer_write) AS io_write_latency,\n       fsbi.count_misc AS io_misc_requests,\n       format_pico_time(fsbi.sum_timer_misc) AS io_misc_latency,\n       sys.format_bytes(ibp.allocated) AS innodb_buffer_allocated,\n       sys.format_bytes(ibp.data) AS innodb_buffer_data,\n       sys.format_bytes(ibp.allocated - ibp.data) AS innodb_buffer_free,\n       ibp.pages AS innodb_buffer_pages,\n       ibp.pages_hashed AS innodb_buffer_pages_hashed,\n       ibp.pages_old AS innodb_buffer_pages_old,\n       ibp.rows_cached AS innodb_buffer_rows_cached\n  FROM performance_schema.table_io_waits_summary_by_table AS pst\n  LEFT JOIN x$ps_schema_table_statistics_io AS fsbi\n    ON pst.object_schema = fsbi.table_schema\n   AND pst.object_name = fsbi.table_name\n  LEFT JOIN sys.x$innodb_buffer_stats_by_table AS ibp\n    ON pst.object_schema = ibp.object_schema\n   AND pst.object_name = ibp.object_name\n ORDER BY pst.sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `pst`.`OBJECT_SCHEMA` AS `table_schema`,`pst`.`OBJECT_NAME` AS `table_name`,`pst`.`COUNT_FETCH` AS `rows_fetched`,format_pico_time(`pst`.`SUM_TIMER_FETCH`) AS `fetch_latency`,`pst`.`COUNT_INSERT` AS `rows_inserted`,format_pico_time(`pst`.`SUM_TIMER_INSERT`) AS `insert_latency`,`pst`.`COUNT_UPDATE` AS `rows_updated`,format_pico_time(`pst`.`SUM_TIMER_UPDATE`) AS `update_latency`,`pst`.`COUNT_DELETE` AS `rows_deleted`,format_pico_time(`pst`.`SUM_TIMER_DELETE`) AS `delete_latency`,`fsbi`.`count_read` AS `io_read_requests`,`sys`.`format_bytes`(`fsbi`.`sum_number_of_bytes_read`) AS `io_read`,format_pico_time(`fsbi`.`sum_timer_read`) AS `io_read_latency`,`fsbi`.`count_write` AS `io_write_requests`,`sys`.`format_bytes`(`fsbi`.`sum_number_of_bytes_write`) AS `io_write`,format_pico_time(`fsbi`.`sum_timer_write`) AS `io_write_latency`,`fsbi`.`count_misc` AS `io_misc_requests`,format_pico_time(`fsbi`.`sum_timer_misc`) AS `io_misc_latency`,`sys`.`format_bytes`(`ibp`.`allocated`) AS `innodb_buffer_allocated`,`sys`.`format_bytes`(`ibp`.`data`) AS `innodb_buffer_data`,`sys`.`format_bytes`(`ibp`.`allocated` - `ibp`.`data`) AS `innodb_buffer_free`,`ibp`.`pages` AS `innodb_buffer_pages`,`ibp`.`pages_hashed` AS `innodb_buffer_pages_hashed`,`ibp`.`pages_old` AS `innodb_buffer_pages_old`,`ibp`.`rows_cached` AS `innodb_buffer_rows_cached` from ((`performance_schema`.`table_io_waits_summary_by_table` `pst` left join `sys`.`x$ps_schema_table_statistics_io` `fsbi` on(`pst`.`OBJECT_SCHEMA` = `fsbi`.`table_schema` and `pst`.`OBJECT_NAME` = `fsbi`.`table_name`)) left join `sys`.`x$innodb_buffer_stats_by_table` `ibp` on(`pst`.`OBJECT_SCHEMA` = `ibp`.`object_schema` and `pst`.`OBJECT_NAME` = `ibp`.`object_name`)) order by `pst`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/schema_tables_with_full_table_scans.frm b/mariadb/sys/schema_tables_with_full_table_scans.frm
new file mode 100644
index 000000000..6de879ee9
--- /dev/null
+++ b/mariadb/sys/schema_tables_with_full_table_scans.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `object_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `object_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` AS `rows_full_scanned`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_WAIT`) AS `latency` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is null and `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` > 0 order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` desc
+md5=dcd97456a8df9123b94972666be066a5
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648182578
+create-version=2
+source=SELECT object_schema,\n       object_name,\n       count_read AS rows_full_scanned,\n       format_pico_time(sum_timer_wait) AS latency\n  FROM performance_schema.table_io_waits_summary_by_index_usage\n WHERE index_name IS NULL\n   AND count_read > 0\n ORDER BY count_read DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `object_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `object_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` AS `rows_full_scanned`,format_pico_time(`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_WAIT`) AS `latency` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is null and `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` > 0 order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` desc
+mariadb-version=110103
diff --git a/mariadb/sys/schema_unused_indexes.frm b/mariadb/sys/schema_unused_indexes.frm
new file mode 100644
index 000000000..f8ec83eea
--- /dev/null
+++ b/mariadb/sys/schema_unused_indexes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `object_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `object_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` AS `index_name` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is not null and `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_STAR` = 0 and `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` <> \'mysql\' and `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` <> \'PRIMARY\' order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME`
+md5=fcec883d9422ee0089c8d60c48eb8238
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648357419
+create-version=2
+source=SELECT object_schema,\n       object_name,\n       index_name\n  FROM performance_schema.table_io_waits_summary_by_index_usage\n WHERE index_name IS NOT NULL\n   AND count_star = 0\n   AND object_schema != \'mysql\'\n   AND index_name != \'PRIMARY\'\n ORDER BY object_schema, object_name;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `object_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `object_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` AS `index_name` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is not null and `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_STAR` = 0 and `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` <> \'mysql\' and `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` <> \'PRIMARY\' order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME`
+mariadb-version=110103
diff --git a/mariadb/sys/session.frm b/mariadb/sys/session.frm
new file mode 100644
index 000000000..fd7466af4
--- /dev/null
+++ b/mariadb/sys/session.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `processlist`.`thd_id` AS `thd_id`,`processlist`.`conn_id` AS `conn_id`,`processlist`.`user` AS `user`,`processlist`.`db` AS `db`,`processlist`.`command` AS `command`,`processlist`.`state` AS `state`,`processlist`.`time` AS `time`,`processlist`.`current_statement` AS `current_statement`,`processlist`.`statement_latency` AS `statement_latency`,`processlist`.`progress` AS `progress`,`processlist`.`lock_latency` AS `lock_latency`,`processlist`.`rows_examined` AS `rows_examined`,`processlist`.`rows_sent` AS `rows_sent`,`processlist`.`rows_affected` AS `rows_affected`,`processlist`.`tmp_tables` AS `tmp_tables`,`processlist`.`tmp_disk_tables` AS `tmp_disk_tables`,`processlist`.`full_scan` AS `full_scan`,`processlist`.`last_statement` AS `last_statement`,`processlist`.`last_statement_latency` AS `last_statement_latency`,`processlist`.`current_memory` AS `current_memory`,`processlist`.`last_wait` AS `last_wait`,`processlist`.`last_wait_latency` AS `last_wait_latency`,`processlist`.`source` AS `source`,`processlist`.`trx_latency` AS `trx_latency`,`processlist`.`trx_state` AS `trx_state`,`processlist`.`trx_autocommit` AS `trx_autocommit`,`processlist`.`pid` AS `pid`,`processlist`.`program_name` AS `program_name` from `sys`.`processlist` where `processlist`.`conn_id` is not null and `processlist`.`command` <> \'Daemon\'
+md5=5d945dd589c16b1108e948bdcabafcf3
+updatable=0
+algorithm=0
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652990920
+create-version=2
+source=SELECT * FROM sys.processlist\nWHERE conn_id IS NOT NULL AND command != \'Daemon\';
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `processlist`.`thd_id` AS `thd_id`,`processlist`.`conn_id` AS `conn_id`,`processlist`.`user` AS `user`,`processlist`.`db` AS `db`,`processlist`.`command` AS `command`,`processlist`.`state` AS `state`,`processlist`.`time` AS `time`,`processlist`.`current_statement` AS `current_statement`,`processlist`.`statement_latency` AS `statement_latency`,`processlist`.`progress` AS `progress`,`processlist`.`lock_latency` AS `lock_latency`,`processlist`.`rows_examined` AS `rows_examined`,`processlist`.`rows_sent` AS `rows_sent`,`processlist`.`rows_affected` AS `rows_affected`,`processlist`.`tmp_tables` AS `tmp_tables`,`processlist`.`tmp_disk_tables` AS `tmp_disk_tables`,`processlist`.`full_scan` AS `full_scan`,`processlist`.`last_statement` AS `last_statement`,`processlist`.`last_statement_latency` AS `last_statement_latency`,`processlist`.`current_memory` AS `current_memory`,`processlist`.`last_wait` AS `last_wait`,`processlist`.`last_wait_latency` AS `last_wait_latency`,`processlist`.`source` AS `source`,`processlist`.`trx_latency` AS `trx_latency`,`processlist`.`trx_state` AS `trx_state`,`processlist`.`trx_autocommit` AS `trx_autocommit`,`processlist`.`pid` AS `pid`,`processlist`.`program_name` AS `program_name` from `sys`.`processlist` where `processlist`.`conn_id` is not null and `processlist`.`command` <> \'Daemon\'
+mariadb-version=110103
diff --git a/mariadb/sys/session_ssl_status.frm b/mariadb/sys/session_ssl_status.frm
new file mode 100644
index 000000000..8d98c129e
--- /dev/null
+++ b/mariadb/sys/session_ssl_status.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sslver`.`THREAD_ID` AS `thread_id`,`sslver`.`VARIABLE_VALUE` AS `ssl_version`,`sslcip`.`VARIABLE_VALUE` AS `ssl_cipher`,`sslreuse`.`VARIABLE_VALUE` AS `ssl_sessions_reused` from ((`performance_schema`.`status_by_thread` `sslver` left join `performance_schema`.`status_by_thread` `sslcip` on(`sslcip`.`THREAD_ID` = `sslver`.`THREAD_ID` and `sslcip`.`VARIABLE_NAME` = \'Ssl_cipher\')) left join `performance_schema`.`status_by_thread` `sslreuse` on(`sslreuse`.`THREAD_ID` = `sslver`.`THREAD_ID` and `sslreuse`.`VARIABLE_NAME` = \'Ssl_sessions_reused\')) where `sslver`.`VARIABLE_NAME` = \'Ssl_version\'
+md5=888bde4bd747f7df3ec788d97818af55
+updatable=0
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153653141052
+create-version=2
+source=SELECT sslver.thread_id,\n       sslver.variable_value ssl_version,\n       sslcip.variable_value ssl_cipher,\n       sslreuse.variable_value ssl_sessions_reused\n  FROM performance_schema.status_by_thread sslver\n  LEFT JOIN performance_schema.status_by_thread sslcip\n    ON (sslcip.thread_id=sslver.thread_id and sslcip.variable_name=\'Ssl_cipher\')\n  LEFT JOIN performance_schema.status_by_thread sslreuse\n    ON (sslreuse.thread_id=sslver.thread_id and sslreuse.variable_name=\'Ssl_sessions_reused\')\n WHERE sslver.variable_name=\'Ssl_version\';
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sslver`.`THREAD_ID` AS `thread_id`,`sslver`.`VARIABLE_VALUE` AS `ssl_version`,`sslcip`.`VARIABLE_VALUE` AS `ssl_cipher`,`sslreuse`.`VARIABLE_VALUE` AS `ssl_sessions_reused` from ((`performance_schema`.`status_by_thread` `sslver` left join `performance_schema`.`status_by_thread` `sslcip` on(`sslcip`.`THREAD_ID` = `sslver`.`THREAD_ID` and `sslcip`.`VARIABLE_NAME` = \'Ssl_cipher\')) left join `performance_schema`.`status_by_thread` `sslreuse` on(`sslreuse`.`THREAD_ID` = `sslver`.`THREAD_ID` and `sslreuse`.`VARIABLE_NAME` = \'Ssl_sessions_reused\')) where `sslver`.`VARIABLE_NAME` = \'Ssl_version\'
+mariadb-version=110103
diff --git a/mariadb/sys/statement_analysis.frm b/mariadb/sys/statement_analysis.frm
new file mode 100644
index 000000000..876a009e5
--- /dev/null
+++ b/mariadb/sys/statement_analysis.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,if(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` > 0,\'*\',\'\') AS `full_scan`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` AS `err_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` AS `warn_count`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_LOCK_TIME`) AS `lock_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` AS `rows_sent`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_sent_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_examined_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_AFFECTED` AS `rows_affected`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_AFFECTED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_affected_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` AS `tmp_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` AS `tmp_disk_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` AS `rows_sorted`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` AS `sort_merge_passes`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen` from `performance_schema`.`events_statements_summary_by_digest` order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+md5=e037e136516fae531ffa6ce3d9fc603f
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648590956
+create-version=2
+source=SELECT sys.format_statement(DIGEST_TEXT) AS query,\n       SCHEMA_NAME AS db,\n       IF(SUM_NO_GOOD_INDEX_USED > 0 OR SUM_NO_INDEX_USED > 0, \'*\', \'\') AS full_scan,\n       COUNT_STAR AS exec_count,\n       SUM_ERRORS AS err_count,\n       SUM_WARNINGS AS warn_count,\n       format_pico_time(SUM_TIMER_WAIT) AS total_latency,\n       format_pico_time(MAX_TIMER_WAIT) AS max_latency,\n       format_pico_time(AVG_TIMER_WAIT) AS avg_latency,\n       format_pico_time(SUM_LOCK_TIME) AS lock_latency,\n       SUM_ROWS_SENT AS rows_sent,\n       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,\n       SUM_ROWS_EXAMINED AS rows_examined,\n       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0))  AS rows_examined_avg,\n       SUM_ROWS_AFFECTED AS rows_affected,\n       ROUND(IFNULL(SUM_ROWS_AFFECTED / NULLIF(COUNT_STAR, 0), 0))  AS rows_affected_avg,\n       SUM_CREATED_TMP_TABLES AS tmp_tables,\n       SUM_CREATED_TMP_DISK_TABLES AS tmp_disk_tables,\n       SUM_SORT_ROWS AS rows_sorted,\n       SUM_SORT_MERGE_PASSES AS sort_merge_passes,\n       DIGEST AS digest,\n       FIRST_SEEN AS first_seen,\n       LAST_SEEN as last_seen\n  FROM performance_schema.events_statements_summary_by_digest\nORDER BY SUM_TIMER_WAIT DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,if(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` > 0,\'*\',\'\') AS `full_scan`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` AS `err_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` AS `warn_count`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_LOCK_TIME`) AS `lock_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` AS `rows_sent`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_sent_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_examined_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_AFFECTED` AS `rows_affected`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_AFFECTED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_affected_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` AS `tmp_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` AS `tmp_disk_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` AS `rows_sorted`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` AS `sort_merge_passes`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen` from `performance_schema`.`events_statements_summary_by_digest` order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/statements_with_errors_or_warnings.frm b/mariadb/sys/statements_with_errors_or_warnings.frm
new file mode 100644
index 000000000..54e5cc427
--- /dev/null
+++ b/mariadb/sys/statements_with_errors_or_warnings.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` AS `errors`,ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100 AS `error_pct`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` AS `warnings`,ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100 AS `warning_pct`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` desc
+md5=0d5bc7a3a6b50253b6b71e214beb1104
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648741037
+create-version=2
+source=SELECT sys.format_statement(DIGEST_TEXT) AS query,\n       SCHEMA_NAME as db,\n       COUNT_STAR AS exec_count,\n       SUM_ERRORS AS errors,\n       IFNULL(SUM_ERRORS / NULLIF(COUNT_STAR, 0), 0) * 100 as error_pct,\n       SUM_WARNINGS AS warnings,\n       IFNULL(SUM_WARNINGS / NULLIF(COUNT_STAR, 0), 0) * 100 as warning_pct,\n       FIRST_SEEN as first_seen,\n       LAST_SEEN as last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest\n WHERE SUM_ERRORS > 0\n    OR SUM_WARNINGS > 0\nORDER BY SUM_ERRORS DESC, SUM_WARNINGS DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` AS `errors`,ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100 AS `error_pct`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` AS `warnings`,ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100 AS `warning_pct`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` desc
+mariadb-version=110103
diff --git a/mariadb/sys/statements_with_full_table_scans.frm b/mariadb/sys/statements_with_full_table_scans.frm
new file mode 100644
index 000000000..3cbe17ccb
--- /dev/null
+++ b/mariadb/sys/statements_with_full_table_scans.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` AS `no_index_used_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` AS `no_good_index_used_count`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100,0) AS `no_index_used_pct`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` / `performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0) AS `rows_sent_avg`,round(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` / `performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0) AS `rows_examined_avg`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where (`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` > 0) and `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`  not like \'SHOW%\' order by round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100,0) desc,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) desc
+md5=c15d5fb47b5ab4f0a5b4d8c50379a100
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648899317
+create-version=2
+source=SELECT sys.format_statement(DIGEST_TEXT) AS query,\n       SCHEMA_NAME as db,\n       COUNT_STAR AS exec_count,\n       format_pico_time(SUM_TIMER_WAIT) AS total_latency,\n       SUM_NO_INDEX_USED AS no_index_used_count,\n       SUM_NO_GOOD_INDEX_USED AS no_good_index_used_count,\n       ROUND(IFNULL(SUM_NO_INDEX_USED / NULLIF(COUNT_STAR, 0), 0) * 100) AS no_index_used_pct,\n       SUM_ROWS_SENT AS rows_sent,\n       SUM_ROWS_EXAMINED AS rows_examined,\n       ROUND(SUM_ROWS_SENT/COUNT_STAR) AS rows_sent_avg,\n       ROUND(SUM_ROWS_EXAMINED/COUNT_STAR) AS rows_examined_avg,\n       FIRST_SEEN as first_seen,\n       LAST_SEEN as last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest\n WHERE (SUM_NO_INDEX_USED > 0\n    OR SUM_NO_GOOD_INDEX_USED > 0)\n   AND DIGEST_TEXT NOT LIKE \'SHOW%\'\n ORDER BY no_index_used_pct DESC, total_latency DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` AS `no_index_used_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` AS `no_good_index_used_count`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100,0) AS `no_index_used_pct`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` / `performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0) AS `rows_sent_avg`,round(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` / `performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0) AS `rows_examined_avg`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where (`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` > 0) and `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`  not like \'SHOW%\' order by round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100,0) desc,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/statements_with_runtimes_in_95th_percentile.frm b/mariadb/sys/statements_with_runtimes_in_95th_percentile.frm
new file mode 100644
index 000000000..cd24c541d
--- /dev/null
+++ b/mariadb/sys/statements_with_runtimes_in_95th_percentile.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sys`.`format_statement`(`stmts`.`DIGEST_TEXT`) AS `query`,`stmts`.`SCHEMA_NAME` AS `db`,if(`stmts`.`SUM_NO_GOOD_INDEX_USED` > 0 or `stmts`.`SUM_NO_INDEX_USED` > 0,\'*\',\'\') AS `full_scan`,`stmts`.`COUNT_STAR` AS `exec_count`,`stmts`.`SUM_ERRORS` AS `err_count`,`stmts`.`SUM_WARNINGS` AS `warn_count`,format_pico_time(`stmts`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`stmts`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`stmts`.`AVG_TIMER_WAIT`) AS `avg_latency`,`stmts`.`SUM_ROWS_SENT` AS `rows_sent`,round(ifnull(`stmts`.`SUM_ROWS_SENT` / nullif(`stmts`.`COUNT_STAR`,0),0),0) AS `rows_sent_avg`,`stmts`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(ifnull(`stmts`.`SUM_ROWS_EXAMINED` / nullif(`stmts`.`COUNT_STAR`,0),0),0) AS `rows_examined_avg`,`stmts`.`FIRST_SEEN` AS `first_seen`,`stmts`.`LAST_SEEN` AS `last_seen`,`stmts`.`DIGEST` AS `digest` from (`performance_schema`.`events_statements_summary_by_digest` `stmts` join `sys`.`x$ps_digest_95th_percentile_by_avg_us` `top_percentile` on(round(`stmts`.`AVG_TIMER_WAIT` / 1000000,0) >= `top_percentile`.`avg_us`)) order by `stmts`.`AVG_TIMER_WAIT` desc
+md5=d6f2238ee4994e7c6edfd0d09d4d5e1d
+updatable=0
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649357522
+create-version=2
+source=SELECT sys.format_statement(DIGEST_TEXT) AS query,\n       SCHEMA_NAME as db,\n       IF(SUM_NO_GOOD_INDEX_USED > 0 OR SUM_NO_INDEX_USED > 0, \'*\', \'\') AS full_scan,\n       COUNT_STAR AS exec_count,\n       SUM_ERRORS AS err_count,\n       SUM_WARNINGS AS warn_count,\n       format_pico_time(SUM_TIMER_WAIT) AS total_latency,\n       format_pico_time(MAX_TIMER_WAIT) AS max_latency,\n       format_pico_time(AVG_TIMER_WAIT) AS avg_latency,\n       SUM_ROWS_SENT AS rows_sent,\n       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,\n       SUM_ROWS_EXAMINED AS rows_examined,\n       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0)) AS rows_examined_avg,\n       FIRST_SEEN AS first_seen,\n       LAST_SEEN AS last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest stmts\n  JOIN sys.x$ps_digest_95th_percentile_by_avg_us AS top_percentile\n    ON ROUND(stmts.avg_timer_wait/1000000) >= top_percentile.avg_us\n ORDER BY AVG_TIMER_WAIT DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sys`.`format_statement`(`stmts`.`DIGEST_TEXT`) AS `query`,`stmts`.`SCHEMA_NAME` AS `db`,if(`stmts`.`SUM_NO_GOOD_INDEX_USED` > 0 or `stmts`.`SUM_NO_INDEX_USED` > 0,\'*\',\'\') AS `full_scan`,`stmts`.`COUNT_STAR` AS `exec_count`,`stmts`.`SUM_ERRORS` AS `err_count`,`stmts`.`SUM_WARNINGS` AS `warn_count`,format_pico_time(`stmts`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`stmts`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`stmts`.`AVG_TIMER_WAIT`) AS `avg_latency`,`stmts`.`SUM_ROWS_SENT` AS `rows_sent`,round(ifnull(`stmts`.`SUM_ROWS_SENT` / nullif(`stmts`.`COUNT_STAR`,0),0),0) AS `rows_sent_avg`,`stmts`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(ifnull(`stmts`.`SUM_ROWS_EXAMINED` / nullif(`stmts`.`COUNT_STAR`,0),0),0) AS `rows_examined_avg`,`stmts`.`FIRST_SEEN` AS `first_seen`,`stmts`.`LAST_SEEN` AS `last_seen`,`stmts`.`DIGEST` AS `digest` from (`performance_schema`.`events_statements_summary_by_digest` `stmts` join `sys`.`x$ps_digest_95th_percentile_by_avg_us` `top_percentile` on(round(`stmts`.`AVG_TIMER_WAIT` / 1000000,0) >= `top_percentile`.`avg_us`)) order by `stmts`.`AVG_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/statements_with_sorting.frm b/mariadb/sys/statements_with_sorting.frm
new file mode 100644
index 000000000..ebaff89cd
--- /dev/null
+++ b/mariadb/sys/statements_with_sorting.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` AS `sort_merge_passes`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_sort_merges`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_SCAN` AS `sorts_using_scans`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_RANGE` AS `sort_using_range`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` AS `rows_sorted`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_rows_sorted`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+md5=6c3395875de3fc576ff6c0e12479986e
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649516066
+create-version=2
+source=SELECT sys.format_statement(DIGEST_TEXT) AS query,\n       SCHEMA_NAME db,\n       COUNT_STAR AS exec_count,\n       format_pico_time(SUM_TIMER_WAIT) AS total_latency,\n       SUM_SORT_MERGE_PASSES AS sort_merge_passes,\n       ROUND(IFNULL(SUM_SORT_MERGE_PASSES / NULLIF(COUNT_STAR, 0), 0)) AS avg_sort_merges,\n       SUM_SORT_SCAN AS sorts_using_scans,\n       SUM_SORT_RANGE AS sort_using_range,\n       SUM_SORT_ROWS AS rows_sorted,\n       ROUND(IFNULL(SUM_SORT_ROWS / NULLIF(COUNT_STAR, 0), 0)) AS avg_rows_sorted,\n       FIRST_SEEN as first_seen,\n       LAST_SEEN as last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest\n WHERE SUM_SORT_ROWS > 0\n ORDER BY SUM_TIMER_WAIT DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` AS `sort_merge_passes`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_sort_merges`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_SCAN` AS `sorts_using_scans`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_RANGE` AS `sort_using_range`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` AS `rows_sorted`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_rows_sorted`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/statements_with_temp_tables.frm b/mariadb/sys/statements_with_temp_tables.frm
new file mode 100644
index 000000000..707423a45
--- /dev/null
+++ b/mariadb/sys/statements_with_temp_tables.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` AS `memory_tmp_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` AS `disk_tmp_tables`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_tmp_tables_per_query`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES`,0),0) * 100,0) AS `tmp_tables_to_disk_pct`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` desc
+md5=44565b2be26dc160193a2c4dc7f37af0
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649674283
+create-version=2
+source=SELECT sys.format_statement(DIGEST_TEXT) AS query,\n       SCHEMA_NAME as db,\n       COUNT_STAR AS exec_count,\n       format_pico_time(SUM_TIMER_WAIT) as total_latency,\n       SUM_CREATED_TMP_TABLES AS memory_tmp_tables,\n       SUM_CREATED_TMP_DISK_TABLES AS disk_tmp_tables,\n       ROUND(IFNULL(SUM_CREATED_TMP_TABLES / NULLIF(COUNT_STAR, 0), 0)) AS avg_tmp_tables_per_query,\n       ROUND(IFNULL(SUM_CREATED_TMP_DISK_TABLES / NULLIF(SUM_CREATED_TMP_TABLES, 0), 0) * 100) AS tmp_tables_to_disk_pct,\n       FIRST_SEEN as first_seen,\n       LAST_SEEN as last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest\n WHERE SUM_CREATED_TMP_TABLES > 0\nORDER BY SUM_CREATED_TMP_DISK_TABLES DESC, SUM_CREATED_TMP_TABLES DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `sys`.`format_statement`(`performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`) AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,format_pico_time(`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT`) AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` AS `memory_tmp_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` AS `disk_tmp_tables`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_tmp_tables_per_query`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES`,0),0) * 100,0) AS `tmp_tables_to_disk_pct`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` desc
+mariadb-version=110103
diff --git a/mariadb/sys/sys_config.MAD b/mariadb/sys/sys_config.MAD
new file mode 100644
index 000000000..487cafae2
Binary files /dev/null and b/mariadb/sys/sys_config.MAD differ
diff --git a/mariadb/sys/sys_config.MAI b/mariadb/sys/sys_config.MAI
new file mode 100644
index 000000000..5078144e6
Binary files /dev/null and b/mariadb/sys/sys_config.MAI differ
diff --git a/mariadb/sys/sys_config.frm b/mariadb/sys/sys_config.frm
new file mode 100644
index 000000000..85822789e
Binary files /dev/null and b/mariadb/sys/sys_config.frm differ
diff --git a/mariadb/sys/user_summary.frm b/mariadb/sys/user_summary.frm
new file mode 100644
index 000000000..dd5dab95a
--- /dev/null
+++ b/mariadb/sys/user_summary.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) AS `user`,sum(`stmt`.`total`) AS `statements`,format_pico_time(sum(`stmt`.`total_latency`)) AS `statement_latency`,format_pico_time(ifnull(sum(`stmt`.`total_latency`) / nullif(sum(`stmt`.`total`),0),0)) AS `statement_avg_latency`,sum(`stmt`.`full_scans`) AS `table_scans`,sum(`io`.`ios`) AS `file_ios`,format_pico_time(sum(`io`.`io_latency`)) AS `file_io_latency`,sum(`performance_schema`.`accounts`.`CURRENT_CONNECTIONS`) AS `current_connections`,sum(`performance_schema`.`accounts`.`TOTAL_CONNECTIONS`) AS `total_connections`,count(distinct `performance_schema`.`accounts`.`HOST`) AS `unique_hosts`,`sys`.`format_bytes`(sum(`mem`.`current_allocated`)) AS `current_memory`,`sys`.`format_bytes`(sum(`mem`.`total_allocated`)) AS `total_memory_allocated` from (((`performance_schema`.`accounts` left join `sys`.`x$user_summary_by_statement_latency` `stmt` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `stmt`.`user`)) left join `sys`.`x$user_summary_by_file_io` `io` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `io`.`user`)) left join `sys`.`x$memory_by_user_by_current_bytes` `mem` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `mem`.`user`)) group by if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) order by sum(`stmt`.`total_latency`) desc
+md5=8257b4d5fe59ed91cc5df1de9bac74a7
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153650632532
+create-version=2
+source=SELECT IF(accounts.user IS NULL, \'background\', accounts.user) AS user,\n       SUM(stmt.total) AS statements,\n       format_pico_time(SUM(stmt.total_latency)) AS statement_latency,\n       format_pico_time(IFNULL(SUM(stmt.total_latency) / NULLIF(SUM(stmt.total), 0), 0)) AS statement_avg_latency,\n       SUM(stmt.full_scans) AS table_scans,\n       SUM(io.ios) AS file_ios,\n       format_pico_time(SUM(io.io_latency)) AS file_io_latency,\n       SUM(accounts.current_connections) AS current_connections,\n       SUM(accounts.total_connections) AS total_connections,\n       COUNT(DISTINCT host) AS unique_hosts,\n       sys.format_bytes(SUM(mem.current_allocated)) AS current_memory,\n       sys.format_bytes(SUM(mem.total_allocated)) AS total_memory_allocated\n  FROM performance_schema.accounts\n  LEFT JOIN sys.x$user_summary_by_statement_latency AS stmt ON IF(accounts.user IS NULL, \'background\', accounts.user) = stmt.user\n  LEFT JOIN sys.x$user_summary_by_file_io AS io ON IF(accounts.user IS NULL, \'background\', accounts.user) = io.user\n  LEFT JOIN sys.x$memory_by_user_by_current_bytes mem ON IF(accounts.user IS NULL, \'background\', accounts.user) = mem.user\n GROUP BY IF(accounts.user IS NULL, \'background\', accounts.user)\n ORDER BY SUM(stmt.total_latency) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) AS `user`,sum(`stmt`.`total`) AS `statements`,format_pico_time(sum(`stmt`.`total_latency`)) AS `statement_latency`,format_pico_time(ifnull(sum(`stmt`.`total_latency`) / nullif(sum(`stmt`.`total`),0),0)) AS `statement_avg_latency`,sum(`stmt`.`full_scans`) AS `table_scans`,sum(`io`.`ios`) AS `file_ios`,format_pico_time(sum(`io`.`io_latency`)) AS `file_io_latency`,sum(`performance_schema`.`accounts`.`CURRENT_CONNECTIONS`) AS `current_connections`,sum(`performance_schema`.`accounts`.`TOTAL_CONNECTIONS`) AS `total_connections`,count(distinct `performance_schema`.`accounts`.`HOST`) AS `unique_hosts`,`sys`.`format_bytes`(sum(`mem`.`current_allocated`)) AS `current_memory`,`sys`.`format_bytes`(sum(`mem`.`total_allocated`)) AS `total_memory_allocated` from (((`performance_schema`.`accounts` left join `sys`.`x$user_summary_by_statement_latency` `stmt` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `stmt`.`user`)) left join `sys`.`x$user_summary_by_file_io` `io` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `io`.`user`)) left join `sys`.`x$memory_by_user_by_current_bytes` `mem` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `mem`.`user`)) group by if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) order by sum(`stmt`.`total_latency`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/user_summary_by_file_io.frm b/mariadb/sys/user_summary_by_file_io.frm
new file mode 100644
index 000000000..5733e9b12
--- /dev/null
+++ b/mariadb/sys/user_summary_by_file_io.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR`) AS `ios`,format_pico_time(sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`)) AS `io_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' group by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=10c9c4273d29bed921d4dd363defd2fe
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649949194
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       SUM(count_star) AS ios,\n       format_pico_time(SUM(sum_timer_wait)) AS io_latency\n  FROM performance_schema.events_waits_summary_by_user_by_event_name\n WHERE event_name LIKE \'wait/io/file/%\'\n GROUP BY IF(user IS NULL, \'background\', user)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR`) AS `ios`,format_pico_time(sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`)) AS `io_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' group by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/user_summary_by_file_io_type.frm b/mariadb/sys/user_summary_by_file_io_type.frm
new file mode 100644
index 000000000..54a1b666d
--- /dev/null
+++ b/mariadb/sys/user_summary_by_file_io_type.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` like \'wait/io/file%\' and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` > 0 order by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=8967c13925c1911b58ec145ebcce896c
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649815949
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       event_name,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS latency,\n       format_pico_time(max_timer_wait) AS max_latency\n  FROM performance_schema.events_waits_summary_by_user_by_event_name\n WHERE event_name LIKE \'wait/io/file%\'\n   AND count_star > 0\n ORDER BY user, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` like \'wait/io/file%\' and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` > 0 order by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/user_summary_by_stages.frm b/mariadb/sys/user_summary_by_stages.frm
new file mode 100644
index 000000000..c44d4321b
--- /dev/null
+++ b/mariadb/sys/user_summary_by_stages.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency` from `performance_schema`.`events_stages_summary_by_user_by_event_name` where `performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=5bdb3d6134c2a3f593fd6d0222ac8e65
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153650482674
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       event_name,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(avg_timer_wait) AS avg_latency\n  FROM performance_schema.events_stages_summary_by_user_by_event_name\n WHERE sum_timer_wait != 0\n ORDER BY user, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency` from `performance_schema`.`events_stages_summary_by_user_by_event_name` where `performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/user_summary_by_statement_latency.frm b/mariadb/sys/user_summary_by_statement_latency.frm
new file mode 100644
index 000000000..a361c9360
--- /dev/null
+++ b/mariadb/sys/user_summary_by_statement_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`)) AS `total_latency`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`)) AS `max_latency`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_LOCK_TIME`)) AS `lock_latency`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_SENT`) AS `rows_sent`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_EXAMINED`) AS `rows_examined`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_AFFECTED`) AS `rows_affected`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_INDEX_USED`) + sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_GOOD_INDEX_USED`) AS `full_scans` from `performance_schema`.`events_statements_summary_by_user_by_event_name` group by if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=ff951e5566ec0a801b10a1d72f5dd0bf
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153650349257
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       SUM(count_star) AS total,\n       format_pico_time(SUM(sum_timer_wait)) AS total_latency,\n       format_pico_time(SUM(max_timer_wait)) AS max_latency,\n       format_pico_time(SUM(sum_lock_time)) AS lock_latency,\n       SUM(sum_rows_sent) AS rows_sent,\n       SUM(sum_rows_examined) AS rows_examined,\n       SUM(sum_rows_affected) AS rows_affected,\n       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans\n  FROM performance_schema.events_statements_summary_by_user_by_event_name\n GROUP BY IF(user IS NULL, \'background\', user)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`)) AS `total_latency`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`)) AS `max_latency`,format_pico_time(sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_LOCK_TIME`)) AS `lock_latency`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_SENT`) AS `rows_sent`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_EXAMINED`) AS `rows_examined`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_AFFECTED`) AS `rows_affected`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_INDEX_USED`) + sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_GOOD_INDEX_USED`) AS `full_scans` from `performance_schema`.`events_statements_summary_by_user_by_event_name` group by if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/user_summary_by_statement_type.frm b/mariadb/sys/user_summary_by_statement_type.frm
new file mode 100644
index 000000000..50cc976ad
--- /dev/null
+++ b/mariadb/sys/user_summary_by_statement_type.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) AS `user`,substring_index(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`EVENT_NAME`,\'/\',-1) AS `statement`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_LOCK_TIME`) AS `lock_latency`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_EXAMINED` AS `rows_examined`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_AFFECTED` AS `rows_affected`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_INDEX_USED` + `performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_GOOD_INDEX_USED` AS `full_scans` from `performance_schema`.`events_statements_summary_by_user_by_event_name` where `performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=0a9fac42f7b7633e6717f26af91d6b06
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153650190983
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       SUBSTRING_INDEX(event_name, \'/\', -1) AS statement,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(max_timer_wait) AS max_latency,\n       format_pico_time(sum_lock_time) AS lock_latency,\n       sum_rows_sent AS rows_sent,\n       sum_rows_examined AS rows_examined,\n       sum_rows_affected AS rows_affected,\n       sum_no_index_used + sum_no_good_index_used AS full_scans\n  FROM performance_schema.events_statements_summary_by_user_by_event_name\n WHERE sum_timer_wait != 0\n ORDER BY user, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) AS `user`,substring_index(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`EVENT_NAME`,\'/\',-1) AS `statement`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,format_pico_time(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_LOCK_TIME`) AS `lock_latency`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_EXAMINED` AS `rows_examined`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_AFFECTED` AS `rows_affected`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_INDEX_USED` + `performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_GOOD_INDEX_USED` AS `full_scans` from `performance_schema`.`events_statements_summary_by_user_by_event_name` where `performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/version.frm b/mariadb/sys/version.frm
new file mode 100644
index 000000000..c17748c36
--- /dev/null
+++ b/mariadb/sys/version.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select \'1.5.1\' AS `sys_version`,version() AS `mysql_version`
+md5=91a844b992f5531ded209bb44c10bae7
+updatable=0
+algorithm=0
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153642682651
+create-version=2
+source=SELECT \'1.5.1\' AS sys_version,\n        version() AS mysql_version;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select \'1.5.1\' AS `sys_version`,version() AS `mysql_version`
+mariadb-version=110103
diff --git a/mariadb/sys/wait_classes_global_by_avg_latency.frm b/mariadb/sys/wait_classes_global_by_avg_latency.frm
new file mode 100644
index 000000000..3d10ea4fe
--- /dev/null
+++ b/mariadb/sys/wait_classes_global_by_avg_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) AS `event_class`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(cast(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) as unsigned)) AS `total_latency`,format_pico_time(min(`performance_schema`.`events_waits_summary_global_by_event_name`.`MIN_TIMER_WAIT`)) AS `min_latency`,format_pico_time(ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0)) AS `avg_latency`,format_pico_time(cast(max(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`) as unsigned)) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 and `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' group by substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) order by ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0) desc
+md5=96242bee6930a9ebab75b6776220c644
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651991055
+create-version=2
+source=SELECT SUBSTRING_INDEX(event_name,\'/\', 3) AS event_class,\n       SUM(COUNT_STAR) AS total,\n       format_pico_time(CAST(SUM(sum_timer_wait) AS UNSIGNED)) AS total_latency,\n       format_pico_time(MIN(min_timer_wait)) AS min_latency,\n       format_pico_time(IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0)) AS avg_latency,\n       format_pico_time(CAST(MAX(max_timer_wait) AS UNSIGNED)) AS max_latency\n  FROM performance_schema.events_waits_summary_global_by_event_name\n WHERE sum_timer_wait > 0\n   AND event_name != \'idle\'\n GROUP BY event_class\n ORDER BY IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) AS `event_class`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(cast(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) as unsigned)) AS `total_latency`,format_pico_time(min(`performance_schema`.`events_waits_summary_global_by_event_name`.`MIN_TIMER_WAIT`)) AS `min_latency`,format_pico_time(ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0)) AS `avg_latency`,format_pico_time(cast(max(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`) as unsigned)) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 and `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' group by substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) order by ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0) desc
+mariadb-version=110103
diff --git a/mariadb/sys/wait_classes_global_by_latency.frm b/mariadb/sys/wait_classes_global_by_latency.frm
new file mode 100644
index 000000000..47cb90a69
--- /dev/null
+++ b/mariadb/sys/wait_classes_global_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) AS `event_class`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`)) AS `total_latency`,format_pico_time(min(`performance_schema`.`events_waits_summary_global_by_event_name`.`MIN_TIMER_WAIT`)) AS `min_latency`,format_pico_time(ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0)) AS `avg_latency`,format_pico_time(max(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`)) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 and `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' group by substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) order by sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=4c494df87284af3b937a84ed12339291
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652140929
+create-version=2
+source=SELECT SUBSTRING_INDEX(event_name,\'/\', 3) AS event_class,\n       SUM(COUNT_STAR) AS total,\n       format_pico_time(SUM(sum_timer_wait)) AS total_latency,\n       format_pico_time(MIN(min_timer_wait)) min_latency,\n       format_pico_time(IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0)) AS avg_latency,\n       format_pico_time(MAX(max_timer_wait)) AS max_latency\n  FROM performance_schema.events_waits_summary_global_by_event_name\n WHERE sum_timer_wait > 0\n   AND event_name != \'idle\'\n GROUP BY SUBSTRING_INDEX(event_name,\'/\', 3)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) AS `event_class`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`) AS `total`,format_pico_time(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`)) AS `total_latency`,format_pico_time(min(`performance_schema`.`events_waits_summary_global_by_event_name`.`MIN_TIMER_WAIT`)) AS `min_latency`,format_pico_time(ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0)) AS `avg_latency`,format_pico_time(max(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`)) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 and `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' group by substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) order by sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/waits_by_host_by_latency.frm b/mariadb/sys/waits_by_host_by_latency.frm
new file mode 100644
index 000000000..557dcbc11
--- /dev/null
+++ b/mariadb/sys/waits_by_host_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` AS `event`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` > 0 order by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=d15ee6286e329ddcf149dcb195833962
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652440926
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       event_name AS event,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(avg_timer_wait) AS avg_latency,\n       format_pico_time(max_timer_wait) AS max_latency\n  FROM performance_schema.events_waits_summary_by_host_by_event_name\n WHERE event_name != \'idle\'\n   AND sum_timer_wait > 0\n ORDER BY host, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` AS `event`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` > 0 order by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/waits_by_user_by_latency.frm b/mariadb/sys/waits_by_user_by_latency.frm
new file mode 100644
index 000000000..410cd0178
--- /dev/null
+++ b/mariadb/sys/waits_by_user_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` AS `event`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is not null and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` > 0 order by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=756ad83e07f144f50c717665485d9461
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652290971
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       event_name AS event,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(avg_timer_wait) AS avg_latency,\n       format_pico_time(max_timer_wait) AS max_latency\n  FROM performance_schema.events_waits_summary_by_user_by_event_name\n WHERE event_name != \'idle\'\n   AND user IS NOT NULL\n   AND sum_timer_wait > 0\n ORDER BY user, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` AS `event`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is not null and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` > 0 order by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/waits_global_by_latency.frm b/mariadb/sys/waits_global_by_latency.frm
new file mode 100644
index 000000000..b63e1abf8
--- /dev/null
+++ b/mariadb/sys/waits_global_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` AS `events`,`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_waits_summary_global_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 order by `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=653d5fed66fefc91b76a1b2bbc2754b3
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652599215
+create-version=2
+source=SELECT event_name AS event,\n       count_star AS total,\n       format_pico_time(sum_timer_wait) AS total_latency,\n       format_pico_time(avg_timer_wait) AS avg_latency,\n       format_pico_time(max_timer_wait) AS max_latency\n  FROM performance_schema.events_waits_summary_global_by_event_name\n WHERE event_name != \'idle\'\n   AND sum_timer_wait > 0\n ORDER BY sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` AS `events`,`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR` AS `total`,format_pico_time(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,format_pico_time(`performance_schema`.`events_waits_summary_global_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,format_pico_time(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 order by `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024host_summary.frm b/mariadb/sys/x@0024host_summary.frm
new file mode 100644
index 000000000..772b3551d
--- /dev/null
+++ b/mariadb/sys/x@0024host_summary.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`accounts`.`HOST` is null,\'background\',`performance_schema`.`accounts`.`HOST`) AS `host`,sum(`stmt`.`total`) AS `statements`,sum(`stmt`.`total_latency`) AS `statement_latency`,sum(`stmt`.`total_latency`) / sum(`stmt`.`total`) AS `statement_avg_latency`,sum(`stmt`.`full_scans`) AS `table_scans`,sum(`io`.`ios`) AS `file_ios`,sum(`io`.`io_latency`) AS `file_io_latency`,sum(`performance_schema`.`accounts`.`CURRENT_CONNECTIONS`) AS `current_connections`,sum(`performance_schema`.`accounts`.`TOTAL_CONNECTIONS`) AS `total_connections`,count(distinct `performance_schema`.`accounts`.`USER`) AS `unique_users`,sum(`mem`.`current_allocated`) AS `current_memory`,sum(`mem`.`total_allocated`) AS `total_memory_allocated` from (((`performance_schema`.`accounts` join `sys`.`x$host_summary_by_statement_latency` `stmt` on(`performance_schema`.`accounts`.`HOST` = `stmt`.`host`)) join `sys`.`x$host_summary_by_file_io` `io` on(`performance_schema`.`accounts`.`HOST` = `io`.`host`)) join `sys`.`x$memory_by_host_by_current_bytes` `mem` on(`performance_schema`.`accounts`.`HOST` = `mem`.`host`)) group by if(`performance_schema`.`accounts`.`HOST` is null,\'background\',`performance_schema`.`accounts`.`HOST`)
+md5=67e4bc9e1f0f2c08e58833e2d5538896
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651899325
+create-version=2
+source=SELECT IF(accounts.host IS NULL, \'background\', accounts.host) AS host,\n       SUM(stmt.total) AS statements,\n       SUM(stmt.total_latency) AS statement_latency,\n       SUM(stmt.total_latency) / SUM(stmt.total) AS statement_avg_latency,\n       SUM(stmt.full_scans) AS table_scans,\n       SUM(io.ios) AS file_ios,\n       SUM(io.io_latency) AS file_io_latency,\n       SUM(accounts.current_connections) AS current_connections,\n       SUM(accounts.total_connections) AS total_connections,\n       COUNT(DISTINCT accounts.user) AS unique_users,\n       SUM(mem.current_allocated) AS current_memory,\n       SUM(mem.total_allocated) AS total_memory_allocated\n  FROM performance_schema.accounts\n  JOIN sys.x$host_summary_by_statement_latency AS stmt ON accounts.host = stmt.host\n  JOIN sys.x$host_summary_by_file_io AS io ON accounts.host = io.host\n  JOIN sys.x$memory_by_host_by_current_bytes mem ON accounts.host = mem.host\n GROUP BY IF(accounts.host IS NULL, \'background\', accounts.host);
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`accounts`.`HOST` is null,\'background\',`performance_schema`.`accounts`.`HOST`) AS `host`,sum(`stmt`.`total`) AS `statements`,sum(`stmt`.`total_latency`) AS `statement_latency`,sum(`stmt`.`total_latency`) / sum(`stmt`.`total`) AS `statement_avg_latency`,sum(`stmt`.`full_scans`) AS `table_scans`,sum(`io`.`ios`) AS `file_ios`,sum(`io`.`io_latency`) AS `file_io_latency`,sum(`performance_schema`.`accounts`.`CURRENT_CONNECTIONS`) AS `current_connections`,sum(`performance_schema`.`accounts`.`TOTAL_CONNECTIONS`) AS `total_connections`,count(distinct `performance_schema`.`accounts`.`USER`) AS `unique_users`,sum(`mem`.`current_allocated`) AS `current_memory`,sum(`mem`.`total_allocated`) AS `total_memory_allocated` from (((`performance_schema`.`accounts` join `sys`.`x$host_summary_by_statement_latency` `stmt` on(`performance_schema`.`accounts`.`HOST` = `stmt`.`host`)) join `sys`.`x$host_summary_by_file_io` `io` on(`performance_schema`.`accounts`.`HOST` = `io`.`host`)) join `sys`.`x$memory_by_host_by_current_bytes` `mem` on(`performance_schema`.`accounts`.`HOST` = `mem`.`host`)) group by if(`performance_schema`.`accounts`.`HOST` is null,\'background\',`performance_schema`.`accounts`.`HOST`)
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024host_summary_by_file_io.frm b/mariadb/sys/x@0024host_summary_by_file_io.frm
new file mode 100644
index 000000000..6cf1df13c
--- /dev/null
+++ b/mariadb/sys/x@0024host_summary_by_file_io.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR`) AS `ios`,sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `io_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' group by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=901c381d3d98dbb46350e5bbae184d88
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651290928
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       SUM(count_star) AS ios,\n       SUM(sum_timer_wait) AS io_latency\n  FROM performance_schema.events_waits_summary_by_host_by_event_name\n WHERE event_name LIKE \'wait/io/file/%\'\n GROUP BY IF(host IS NULL, \'background\', host)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR`) AS `ios`,sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `io_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' group by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024host_summary_by_file_io_type.frm b/mariadb/sys/x@0024host_summary_by_file_io_type.frm
new file mode 100644
index 000000000..d4db63618
--- /dev/null
+++ b/mariadb/sys/x@0024host_summary_by_file_io_type.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` like \'wait/io/file%\' and `performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` > 0 order by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=d62d46509ecc2c266e46ec8a89b866f9
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651140955
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       event_name,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       max_timer_wait AS max_latency\n  FROM performance_schema.events_waits_summary_by_host_by_event_name\n WHERE event_name LIKE \'wait/io/file%\'\n   AND count_star > 0\n ORDER BY IF(host IS NULL, \'background\', host), sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` like \'wait/io/file%\' and `performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` > 0 order by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024host_summary_by_stages.frm b/mariadb/sys/x@0024host_summary_by_stages.frm
new file mode 100644
index 000000000..e3e9247e9
--- /dev/null
+++ b/mariadb/sys/x@0024host_summary_by_stages.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency` from `performance_schema`.`events_stages_summary_by_host_by_event_name` where `performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=fc6f8e38aee0ae855dab711a3ba9f56c
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651749399
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       event_name,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       avg_timer_wait AS avg_latency\n  FROM performance_schema.events_stages_summary_by_host_by_event_name\n WHERE sum_timer_wait != 0\n ORDER BY IF(host IS NULL, \'background\', host), sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_stages_summary_by_host_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency` from `performance_schema`.`events_stages_summary_by_host_by_event_name` where `performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_stages_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_stages_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024host_summary_by_statement_latency.frm b/mariadb/sys/x@0024host_summary_by_statement_latency.frm
new file mode 100644
index 000000000..2d8fd1384
--- /dev/null
+++ b/mariadb/sys/x@0024host_summary_by_statement_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,max(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_LOCK_TIME`) AS `lock_latency`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_SENT`) AS `rows_sent`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_EXAMINED`) AS `rows_examined`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_AFFECTED`) AS `rows_affected`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_INDEX_USED`) + sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_GOOD_INDEX_USED`) AS `full_scans` from `performance_schema`.`events_statements_summary_by_host_by_event_name` group by if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=80be376168c9b08aa7c19aaf5ebee747
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651599213
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       SUM(count_star) AS total,\n       SUM(sum_timer_wait) AS total_latency,\n       MAX(max_timer_wait) AS max_latency,\n       SUM(sum_lock_time) AS lock_latency,\n       SUM(sum_rows_sent) AS rows_sent,\n       SUM(sum_rows_examined) AS rows_examined,\n       SUM(sum_rows_affected) AS rows_affected,\n       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans\n  FROM performance_schema.events_statements_summary_by_host_by_event_name\n GROUP BY IF(host IS NULL, \'background\', host)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,max(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_LOCK_TIME`) AS `lock_latency`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_SENT`) AS `rows_sent`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_EXAMINED`) AS `rows_examined`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_AFFECTED`) AS `rows_affected`,sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_INDEX_USED`) + sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_GOOD_INDEX_USED`) AS `full_scans` from `performance_schema`.`events_statements_summary_by_host_by_event_name` group by if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024host_summary_by_statement_type.frm b/mariadb/sys/x@0024host_summary_by_statement_type.frm
new file mode 100644
index 000000000..9e394579d
--- /dev/null
+++ b/mariadb/sys/x@0024host_summary_by_statement_type.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) AS `host`,substring_index(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`EVENT_NAME`,\'/\',-1) AS `statement`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_LOCK_TIME` AS `lock_latency`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_EXAMINED` AS `rows_examined`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_AFFECTED` AS `rows_affected`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_INDEX_USED` + `performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_GOOD_INDEX_USED` AS `full_scans` from `performance_schema`.`events_statements_summary_by_host_by_event_name` where `performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=f0524c728d74e019a8384c7369a71a51
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153651440860
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       SUBSTRING_INDEX(event_name, \'/\', -1) AS statement,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       max_timer_wait AS max_latency,\n       sum_lock_time AS lock_latency,\n       sum_rows_sent AS rows_sent,\n       sum_rows_examined AS rows_examined,\n       sum_rows_affected AS rows_affected,\n       sum_no_index_used + sum_no_good_index_used AS full_scans\n  FROM performance_schema.events_statements_summary_by_host_by_event_name\n WHERE sum_timer_wait != 0\n ORDER BY IF(host IS NULL, \'background\', host), sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`) AS `host`,substring_index(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`EVENT_NAME`,\'/\',-1) AS `statement`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_LOCK_TIME` AS `lock_latency`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_EXAMINED` AS `rows_examined`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_ROWS_AFFECTED` AS `rows_affected`,`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_INDEX_USED` + `performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_NO_GOOD_INDEX_USED` AS `full_scans` from `performance_schema`.`events_statements_summary_by_host_by_event_name` where `performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_statements_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_statements_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024innodb_buffer_stats_by_schema.frm b/mariadb/sys/x@0024innodb_buffer_stats_by_schema.frm
new file mode 100644
index 000000000..3492bfb15
--- /dev/null
+++ b/mariadb/sys/x@0024innodb_buffer_stats_by_schema.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) AS `object_schema`,sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) AS `allocated`,sum(`ibp`.`DATA_SIZE`) AS `data`,count(`ibp`.`PAGE_NUMBER`) AS `pages`,count(if(`ibp`.`IS_HASHED`,1,NULL)) AS `pages_hashed`,count(if(`ibp`.`IS_OLD`,1,NULL)) AS `pages_old`,round(ifnull(sum(`ibp`.`NUMBER_RECORDS`) / nullif(count(distinct `ibp`.`INDEX_NAME`),0),0),0) AS `rows_cached` from `information_schema`.`innodb_buffer_page` `ibp` where `ibp`.`TABLE_NAME` is not null group by if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) order by sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) desc
+md5=5520d476400f773f5e963f96dc10e46a
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153644974221
+create-version=2
+source=SELECT IF(LOCATE(\'.\', ibp.table_name) = 0, \'InnoDB System\', REPLACE(SUBSTRING_INDEX(ibp.table_name, \'.\', 1), \'`\', \'\')) AS object_schema,\n       SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) AS allocated,\n       SUM(ibp.data_size) AS data,\n       COUNT(ibp.page_number) AS pages,\n       COUNT(IF(ibp.is_hashed, 1, NULL)) AS pages_hashed,\n       COUNT(IF(ibp.is_old, 1, NULL)) AS pages_old,\n       ROUND(IFNULL(SUM(ibp.number_records)/NULLIF(COUNT(DISTINCT ibp.index_name), 0), 0)) AS rows_cached\n  FROM information_schema.innodb_buffer_page ibp\n WHERE table_name IS NOT NULL\n GROUP BY object_schema\n ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) AS `object_schema`,sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) AS `allocated`,sum(`ibp`.`DATA_SIZE`) AS `data`,count(`ibp`.`PAGE_NUMBER`) AS `pages`,count(if(`ibp`.`IS_HASHED`,1,NULL)) AS `pages_hashed`,count(if(`ibp`.`IS_OLD`,1,NULL)) AS `pages_old`,round(ifnull(sum(`ibp`.`NUMBER_RECORDS`) / nullif(count(distinct `ibp`.`INDEX_NAME`),0),0),0) AS `rows_cached` from `information_schema`.`innodb_buffer_page` `ibp` where `ibp`.`TABLE_NAME` is not null group by if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) order by sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024innodb_buffer_stats_by_table.frm b/mariadb/sys/x@0024innodb_buffer_stats_by_table.frm
new file mode 100644
index 000000000..6310300e8
--- /dev/null
+++ b/mariadb/sys/x@0024innodb_buffer_stats_by_table.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) AS `object_schema`,replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',-1),\'`\',\'\') AS `object_name`,sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) AS `allocated`,sum(`ibp`.`DATA_SIZE`) AS `data`,count(`ibp`.`PAGE_NUMBER`) AS `pages`,count(if(`ibp`.`IS_HASHED`,1,NULL)) AS `pages_hashed`,count(if(`ibp`.`IS_OLD`,1,NULL)) AS `pages_old`,round(ifnull(sum(`ibp`.`NUMBER_RECORDS`) / nullif(count(distinct `ibp`.`INDEX_NAME`),0),0),0) AS `rows_cached` from `information_schema`.`innodb_buffer_page` `ibp` where `ibp`.`TABLE_NAME` is not null group by if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')),replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',-1),\'`\',\'\') order by sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) desc
+md5=db96ddcff1919852c2c98356a6e4cc80
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645140837
+create-version=2
+source=SELECT IF(LOCATE(\'.\', ibp.table_name) = 0, \'InnoDB System\', REPLACE(SUBSTRING_INDEX(ibp.table_name, \'.\', 1), \'`\', \'\')) AS object_schema,\n       REPLACE(SUBSTRING_INDEX(ibp.table_name, \'.\', -1), \'`\', \'\') AS object_name,\n       SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) AS allocated,\n       SUM(ibp.data_size) AS data,\n       COUNT(ibp.page_number) AS pages,\n       COUNT(IF(ibp.is_hashed, 1, NULL)) AS pages_hashed,\n       COUNT(IF(ibp.is_old, 1, NULL)) AS pages_old,\n       ROUND(IFNULL(SUM(ibp.number_records)/NULLIF(COUNT(DISTINCT ibp.index_name), 0), 0)) AS rows_cached\n  FROM information_schema.innodb_buffer_page ibp\n WHERE table_name IS NOT NULL\n GROUP BY object_schema, object_name\n ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')) AS `object_schema`,replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',-1),\'`\',\'\') AS `object_name`,sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) AS `allocated`,sum(`ibp`.`DATA_SIZE`) AS `data`,count(`ibp`.`PAGE_NUMBER`) AS `pages`,count(if(`ibp`.`IS_HASHED`,1,NULL)) AS `pages_hashed`,count(if(`ibp`.`IS_OLD`,1,NULL)) AS `pages_old`,round(ifnull(sum(`ibp`.`NUMBER_RECORDS`) / nullif(count(distinct `ibp`.`INDEX_NAME`),0),0),0) AS `rows_cached` from `information_schema`.`innodb_buffer_page` `ibp` where `ibp`.`TABLE_NAME` is not null group by if(locate(\'.\',`ibp`.`TABLE_NAME`) = 0,\'InnoDB System\',replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',1),\'`\',\'\')),replace(substring_index(`ibp`.`TABLE_NAME`,\'.\',-1),\'`\',\'\') order by sum(if(`ibp`.`COMPRESSED_SIZE` = 0,16384,`ibp`.`COMPRESSED_SIZE`)) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024innodb_lock_waits.frm b/mariadb/sys/x@0024innodb_lock_waits.frm
new file mode 100644
index 000000000..bed3f3aba
--- /dev/null
+++ b/mariadb/sys/x@0024innodb_lock_waits.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `r`.`trx_wait_started` AS `wait_started`,timediff(current_timestamp(),`r`.`trx_wait_started`) AS `wait_age`,timestampdiff(SECOND,`r`.`trx_wait_started`,current_timestamp()) AS `wait_age_secs`,`rl`.`lock_table` AS `locked_table`,`rl`.`lock_index` AS `locked_index`,`rl`.`lock_type` AS `locked_type`,`r`.`trx_id` AS `waiting_trx_id`,`r`.`trx_started` AS `waiting_trx_started`,timediff(current_timestamp(),`r`.`trx_started`) AS `waiting_trx_age`,`r`.`trx_rows_locked` AS `waiting_trx_rows_locked`,`r`.`trx_rows_modified` AS `waiting_trx_rows_modified`,`r`.`trx_mysql_thread_id` AS `waiting_pid`,`r`.`trx_query` AS `waiting_query`,`rl`.`lock_id` AS `waiting_lock_id`,`rl`.`lock_mode` AS `waiting_lock_mode`,`b`.`trx_id` AS `blocking_trx_id`,`b`.`trx_mysql_thread_id` AS `blocking_pid`,`b`.`trx_query` AS `blocking_query`,`bl`.`lock_id` AS `blocking_lock_id`,`bl`.`lock_mode` AS `blocking_lock_mode`,`b`.`trx_started` AS `blocking_trx_started`,timediff(current_timestamp(),`b`.`trx_started`) AS `blocking_trx_age`,`b`.`trx_rows_locked` AS `blocking_trx_rows_locked`,`b`.`trx_rows_modified` AS `blocking_trx_rows_modified`,concat(\'KILL QUERY \',`b`.`trx_mysql_thread_id`) AS `sql_kill_blocking_query`,concat(\'KILL \',`b`.`trx_mysql_thread_id`) AS `sql_kill_blocking_connection` from ((((`information_schema`.`innodb_lock_waits` `w` join `information_schema`.`innodb_trx` `b` on(`b`.`trx_id` = `w`.`blocking_trx_id`)) join `information_schema`.`innodb_trx` `r` on(`r`.`trx_id` = `w`.`requesting_trx_id`)) join `information_schema`.`innodb_locks` `bl` on(`bl`.`lock_id` = `w`.`blocking_lock_id`)) join `information_schema`.`innodb_locks` `rl` on(`rl`.`lock_id` = `w`.`requested_lock_id`)) order by `r`.`trx_wait_started`
+md5=a220fb929bcd0fe52730169f87db8aaa
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645357512
+create-version=2
+source=SELECT r.trx_wait_started AS wait_started,\n       TIMEDIFF(NOW(), r.trx_wait_started) AS wait_age,\n       TIMESTAMPDIFF(SECOND, r.trx_wait_started, NOW()) AS wait_age_secs,\n       rl.lock_table AS locked_table,\n       rl.lock_index AS locked_index,\n       rl.lock_type AS locked_type,\n       r.trx_id AS waiting_trx_id,\n       r.trx_started as waiting_trx_started,\n       TIMEDIFF(NOW(), r.trx_started) AS waiting_trx_age,\n       r.trx_rows_locked AS waiting_trx_rows_locked,\n       r.trx_rows_modified AS waiting_trx_rows_modified,\n       r.trx_mysql_thread_id AS waiting_pid,\n       r.trx_query AS waiting_query,\n       rl.lock_id AS waiting_lock_id,\n       rl.lock_mode AS waiting_lock_mode,\n       b.trx_id AS blocking_trx_id,\n       b.trx_mysql_thread_id AS blocking_pid,\n       b.trx_query AS blocking_query,\n       bl.lock_id AS blocking_lock_id,\n       bl.lock_mode AS blocking_lock_mode,\n       b.trx_started AS blocking_trx_started,\n       TIMEDIFF(NOW(), b.trx_started) AS blocking_trx_age,\n       b.trx_rows_locked AS blocking_trx_rows_locked,\n       b.trx_rows_modified AS blocking_trx_rows_modified,\n       CONCAT(\'KILL QUERY \', b.trx_mysql_thread_id) AS sql_kill_blocking_query,\n       CONCAT(\'KILL \', b.trx_mysql_thread_id) AS sql_kill_blocking_connection\n  FROM information_schema.innodb_lock_waits w\n       INNER JOIN information_schema.innodb_trx b    ON b.trx_id = w.blocking_trx_id\n       INNER JOIN information_schema.innodb_trx r    ON r.trx_id = w.requesting_trx_id\n       INNER JOIN information_schema.innodb_locks bl ON bl.lock_id = w.blocking_lock_id\n       INNER JOIN information_schema.innodb_locks rl ON rl.lock_id = w.requested_lock_id\n ORDER BY r.trx_wait_started;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `r`.`trx_wait_started` AS `wait_started`,timediff(current_timestamp(),`r`.`trx_wait_started`) AS `wait_age`,timestampdiff(SECOND,`r`.`trx_wait_started`,current_timestamp()) AS `wait_age_secs`,`rl`.`lock_table` AS `locked_table`,`rl`.`lock_index` AS `locked_index`,`rl`.`lock_type` AS `locked_type`,`r`.`trx_id` AS `waiting_trx_id`,`r`.`trx_started` AS `waiting_trx_started`,timediff(current_timestamp(),`r`.`trx_started`) AS `waiting_trx_age`,`r`.`trx_rows_locked` AS `waiting_trx_rows_locked`,`r`.`trx_rows_modified` AS `waiting_trx_rows_modified`,`r`.`trx_mysql_thread_id` AS `waiting_pid`,`r`.`trx_query` AS `waiting_query`,`rl`.`lock_id` AS `waiting_lock_id`,`rl`.`lock_mode` AS `waiting_lock_mode`,`b`.`trx_id` AS `blocking_trx_id`,`b`.`trx_mysql_thread_id` AS `blocking_pid`,`b`.`trx_query` AS `blocking_query`,`bl`.`lock_id` AS `blocking_lock_id`,`bl`.`lock_mode` AS `blocking_lock_mode`,`b`.`trx_started` AS `blocking_trx_started`,timediff(current_timestamp(),`b`.`trx_started`) AS `blocking_trx_age`,`b`.`trx_rows_locked` AS `blocking_trx_rows_locked`,`b`.`trx_rows_modified` AS `blocking_trx_rows_modified`,concat(\'KILL QUERY \',`b`.`trx_mysql_thread_id`) AS `sql_kill_blocking_query`,concat(\'KILL \',`b`.`trx_mysql_thread_id`) AS `sql_kill_blocking_connection` from ((((`information_schema`.`innodb_lock_waits` `w` join `information_schema`.`innodb_trx` `b` on(`b`.`trx_id` = `w`.`blocking_trx_id`)) join `information_schema`.`innodb_trx` `r` on(`r`.`trx_id` = `w`.`requesting_trx_id`)) join `information_schema`.`innodb_locks` `bl` on(`bl`.`lock_id` = `w`.`blocking_lock_id`)) join `information_schema`.`innodb_locks` `rl` on(`rl`.`lock_id` = `w`.`requested_lock_id`)) order by `r`.`trx_wait_started`
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024io_by_thread_by_latency.frm b/mariadb/sys/x@0024io_by_thread_by_latency.frm
new file mode 100644
index 000000000..13ddcb9ab
--- /dev/null
+++ b/mariadb/sys/x@0024io_by_thread_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`threads`.`PROCESSLIST_ID` is null,substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),concat(`performance_schema`.`threads`.`PROCESSLIST_USER`,\'@\',`performance_schema`.`threads`.`PROCESSLIST_HOST`)) AS `user`,sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,min(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`MIN_TIMER_WAIT`) AS `min_latency`,avg(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,max(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID` AS `thread_id`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `processlist_id` from (`performance_schema`.`events_waits_summary_by_thread_by_event_name` left join `performance_schema`.`threads` on(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID` = `performance_schema`.`threads`.`THREAD_ID`)) where `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT` > 0 group by `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID`,`performance_schema`.`threads`.`PROCESSLIST_ID`,if(`performance_schema`.`threads`.`PROCESSLIST_ID` is null,substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),concat(`performance_schema`.`threads`.`PROCESSLIST_USER`,\'@\',`performance_schema`.`threads`.`PROCESSLIST_HOST`)) order by sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=29975fcb1586f6e3585d5fd6a60de8e5
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646199329
+create-version=2
+source=SELECT IF(processlist_id IS NULL,\n             SUBSTRING_INDEX(name, \'/\', -1),\n             CONCAT(processlist_user, \'@\', processlist_host)\n          ) user,\n       SUM(count_star) total,\n       SUM(sum_timer_wait) total_latency,\n       MIN(min_timer_wait) min_latency,\n       AVG(avg_timer_wait) avg_latency,\n       MAX(max_timer_wait) max_latency,\n       thread_id,\n       processlist_id\n  FROM performance_schema.events_waits_summary_by_thread_by_event_name\n  LEFT JOIN performance_schema.threads USING (thread_id)\n WHERE event_name LIKE \'wait/io/file/%\'\n   AND sum_timer_wait > 0\n GROUP BY thread_id, processlist_id, user\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`threads`.`PROCESSLIST_ID` is null,substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),concat(`performance_schema`.`threads`.`PROCESSLIST_USER`,\'@\',`performance_schema`.`threads`.`PROCESSLIST_HOST`)) AS `user`,sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,min(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`MIN_TIMER_WAIT`) AS `min_latency`,avg(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`AVG_TIMER_WAIT`) AS `avg_latency`,max(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID` AS `thread_id`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `processlist_id` from (`performance_schema`.`events_waits_summary_by_thread_by_event_name` left join `performance_schema`.`threads` on(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID` = `performance_schema`.`threads`.`THREAD_ID`)) where `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT` > 0 group by `performance_schema`.`events_waits_summary_by_thread_by_event_name`.`THREAD_ID`,`performance_schema`.`threads`.`PROCESSLIST_ID`,if(`performance_schema`.`threads`.`PROCESSLIST_ID` is null,substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),concat(`performance_schema`.`threads`.`PROCESSLIST_USER`,\'@\',`performance_schema`.`threads`.`PROCESSLIST_HOST`)) order by sum(`performance_schema`.`events_waits_summary_by_thread_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024io_global_by_file_by_bytes.frm b/mariadb/sys/x@0024io_global_by_file_by_bytes.frm
new file mode 100644
index 000000000..cd7e60633
--- /dev/null
+++ b/mariadb/sys/x@0024io_global_by_file_by_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`file_summary_by_instance`.`FILE_NAME` AS `file`,`performance_schema`.`file_summary_by_instance`.`COUNT_READ` AS `count_read`,`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` AS `total_read`,ifnull(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_instance`.`COUNT_READ`,0),0) AS `avg_read`,`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE` AS `count_write`,`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` AS `total_written`,ifnull(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE`,0),0.00) AS `avg_write`,`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` AS `total`,ifnull(round(100 - `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`,0) * 100,2),0.00) AS `write_pct` from `performance_schema`.`file_summary_by_instance` order by `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` desc
+md5=f8ce3994ef1b5e0e16bba41ce17bacf9
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646349284
+create-version=2
+source=SELECT file_name AS file,\n       count_read,\n       sum_number_of_bytes_read AS total_read,\n       IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0) AS avg_read,\n       count_write,\n       sum_number_of_bytes_write AS total_written,\n       IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0.00) AS avg_write,\n       sum_number_of_bytes_read + sum_number_of_bytes_write AS total,\n       IFNULL(ROUND(100-((sum_number_of_bytes_read/ NULLIF((sum_number_of_bytes_read+sum_number_of_bytes_write), 0))*100), 2), 0.00) AS write_pct\n  FROM performance_schema.file_summary_by_instance\n ORDER BY sum_number_of_bytes_read + sum_number_of_bytes_write DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`file_summary_by_instance`.`FILE_NAME` AS `file`,`performance_schema`.`file_summary_by_instance`.`COUNT_READ` AS `count_read`,`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` AS `total_read`,ifnull(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_instance`.`COUNT_READ`,0),0) AS `avg_read`,`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE` AS `count_write`,`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` AS `total_written`,ifnull(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE`,0),0.00) AS `avg_write`,`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` AS `total`,ifnull(round(100 - `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`,0) * 100,2),0.00) AS `write_pct` from `performance_schema`.`file_summary_by_instance` order by `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ` + `performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024io_global_by_file_by_latency.frm b/mariadb/sys/x@0024io_global_by_file_by_latency.frm
new file mode 100644
index 000000000..882938c4f
--- /dev/null
+++ b/mariadb/sys/x@0024io_global_by_file_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`file_summary_by_instance`.`FILE_NAME` AS `file`,`performance_schema`.`file_summary_by_instance`.`COUNT_STAR` AS `total`,`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_READ` AS `count_read`,`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_READ` AS `read_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE` AS `count_write`,`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WRITE` AS `write_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_MISC` AS `count_misc`,`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_MISC` AS `misc_latency` from `performance_schema`.`file_summary_by_instance` order by `performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WAIT` desc
+md5=7dd2b8d418cc363387dfae597c25a9f4
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646524253
+create-version=2
+source=SELECT file_name AS file,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       count_read,\n       sum_timer_read AS read_latency,\n       count_write,\n       sum_timer_write AS write_latency,\n       count_misc,\n       sum_timer_misc AS misc_latency\n  FROM performance_schema.file_summary_by_instance\n ORDER BY sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`file_summary_by_instance`.`FILE_NAME` AS `file`,`performance_schema`.`file_summary_by_instance`.`COUNT_STAR` AS `total`,`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_READ` AS `count_read`,`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_READ` AS `read_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE` AS `count_write`,`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WRITE` AS `write_latency`,`performance_schema`.`file_summary_by_instance`.`COUNT_MISC` AS `count_misc`,`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_MISC` AS `misc_latency` from `performance_schema`.`file_summary_by_instance` order by `performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024io_global_by_wait_by_bytes.frm b/mariadb/sys/x@0024io_global_by_wait_by_bytes.frm
new file mode 100644
index 000000000..ca1661620
--- /dev/null
+++ b/mariadb/sys/x@0024io_global_by_wait_by_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select substring_index(`performance_schema`.`file_summary_by_event_name`.`EVENT_NAME`,\'/\',-2) AS `event_name`,`performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`file_summary_by_event_name`.`MIN_TIMER_WAIT` AS `min_latency`,`performance_schema`.`file_summary_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`file_summary_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`file_summary_by_event_name`.`COUNT_READ` AS `count_read`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` AS `total_read`,ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_READ`,0),0) AS `avg_read`,`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE` AS `count_write`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` AS `total_written`,ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE`,0),0) AS `avg_written`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` + `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` AS `total_requested` from `performance_schema`.`file_summary_by_event_name` where `performance_schema`.`file_summary_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` > 0 order by `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` + `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` desc
+md5=4e712a79cda141c8bd60eb52f295fac7
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646674268
+create-version=2
+source=SELECT SUBSTRING_INDEX(event_name, \'/\', -2) AS event_name,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       min_timer_wait AS min_latency,\n       avg_timer_wait AS avg_latency,\n       max_timer_wait AS max_latency,\n       count_read,\n       sum_number_of_bytes_read AS total_read,\n       IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0) AS avg_read,\n       count_write,\n       sum_number_of_bytes_write AS total_written,\n       IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0) AS avg_written,\n       sum_number_of_bytes_write + sum_number_of_bytes_read AS total_requested\n  FROM performance_schema.file_summary_by_event_name\n WHERE event_name LIKE \'wait/io/file/%\'\n   AND count_star > 0\n ORDER BY sum_number_of_bytes_write + sum_number_of_bytes_read DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select substring_index(`performance_schema`.`file_summary_by_event_name`.`EVENT_NAME`,\'/\',-2) AS `event_name`,`performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`file_summary_by_event_name`.`MIN_TIMER_WAIT` AS `min_latency`,`performance_schema`.`file_summary_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`file_summary_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`file_summary_by_event_name`.`COUNT_READ` AS `count_read`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` AS `total_read`,ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_READ`,0),0) AS `avg_read`,`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE` AS `count_write`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` AS `total_written`,ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE`,0),0) AS `avg_written`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` + `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` AS `total_requested` from `performance_schema`.`file_summary_by_event_name` where `performance_schema`.`file_summary_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` > 0 order by `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` + `performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024io_global_by_wait_by_latency.frm b/mariadb/sys/x@0024io_global_by_wait_by_latency.frm
new file mode 100644
index 000000000..f780b882e
--- /dev/null
+++ b/mariadb/sys/x@0024io_global_by_wait_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select substring_index(`performance_schema`.`file_summary_by_event_name`.`EVENT_NAME`,\'/\',-2) AS `event_name`,`performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`file_summary_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`file_summary_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_READ` AS `read_latency`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WRITE` AS `write_latency`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_MISC` AS `misc_latency`,`performance_schema`.`file_summary_by_event_name`.`COUNT_READ` AS `count_read`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` AS `total_read`,ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_READ`,0),0) AS `avg_read`,`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE` AS `count_write`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` AS `total_written`,ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE`,0),0) AS `avg_written` from `performance_schema`.`file_summary_by_event_name` where `performance_schema`.`file_summary_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` > 0 order by `performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=f414c9e62430c6f80dbc0bc5159ae49c
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646824170
+create-version=2
+source=SELECT SUBSTRING_INDEX(event_name, \'/\', -2) AS event_name,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       avg_timer_wait AS avg_latency,\n       max_timer_wait AS max_latency,\n       sum_timer_read AS read_latency,\n       sum_timer_write AS write_latency,\n       sum_timer_misc AS misc_latency,\n       count_read,\n       sum_number_of_bytes_read AS total_read,\n       IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0) AS avg_read,\n       count_write,\n       sum_number_of_bytes_write AS total_written,\n       IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0) AS avg_written\n  FROM performance_schema.file_summary_by_event_name\n WHERE event_name LIKE \'wait/io/file/%\'\n   AND count_star > 0\n ORDER BY sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select substring_index(`performance_schema`.`file_summary_by_event_name`.`EVENT_NAME`,\'/\',-2) AS `event_name`,`performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`file_summary_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`file_summary_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_READ` AS `read_latency`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WRITE` AS `write_latency`,`performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_MISC` AS `misc_latency`,`performance_schema`.`file_summary_by_event_name`.`COUNT_READ` AS `count_read`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` AS `total_read`,ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_READ` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_READ`,0),0) AS `avg_read`,`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE` AS `count_write`,`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` AS `total_written`,ifnull(`performance_schema`.`file_summary_by_event_name`.`SUM_NUMBER_OF_BYTES_WRITE` / nullif(`performance_schema`.`file_summary_by_event_name`.`COUNT_WRITE`,0),0) AS `avg_written` from `performance_schema`.`file_summary_by_event_name` where `performance_schema`.`file_summary_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' and `performance_schema`.`file_summary_by_event_name`.`COUNT_STAR` > 0 order by `performance_schema`.`file_summary_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024latest_file_io.frm b/mariadb/sys/x@0024latest_file_io.frm
new file mode 100644
index 000000000..1f6513335
--- /dev/null
+++ b/mariadb/sys/x@0024latest_file_io.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`information_schema`.`processlist`.`ID` is null,concat(substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),\':\',`performance_schema`.`events_waits_history_long`.`THREAD_ID`),concat(`information_schema`.`processlist`.`USER`,\'@\',`information_schema`.`processlist`.`HOST`,\':\',`information_schema`.`processlist`.`ID`)) AS `thread`,`performance_schema`.`events_waits_history_long`.`OBJECT_NAME` AS `file`,`performance_schema`.`events_waits_history_long`.`TIMER_WAIT` AS `latency`,`performance_schema`.`events_waits_history_long`.`OPERATION` AS `operation`,`performance_schema`.`events_waits_history_long`.`NUMBER_OF_BYTES` AS `requested` from ((`performance_schema`.`events_waits_history_long` join `performance_schema`.`threads` on(`performance_schema`.`events_waits_history_long`.`THREAD_ID` = `performance_schema`.`threads`.`THREAD_ID`)) left join `information_schema`.`processlist` on(`performance_schema`.`threads`.`PROCESSLIST_ID` = `information_schema`.`processlist`.`ID`)) where `performance_schema`.`events_waits_history_long`.`OBJECT_NAME` is not null and `performance_schema`.`events_waits_history_long`.`EVENT_NAME` like \'wait/io/file/%\' order by `performance_schema`.`events_waits_history_long`.`TIMER_START`
+md5=57dc75fb0d8f65a34b4a54eed20c702c
+updatable=0
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646049126
+create-version=2
+source=SELECT IF(id IS NULL,\n             CONCAT(SUBSTRING_INDEX(name, \'/\', -1), \':\', thread_id),\n             CONCAT(user, \'@\', host, \':\', id)\n          ) thread,\n       object_name file,\n       timer_wait AS latency,\n       operation,\n       number_of_bytes AS requested\n  FROM performance_schema.events_waits_history_long\n  JOIN performance_schema.threads USING (thread_id)\n  LEFT JOIN information_schema.processlist ON processlist_id = id\n WHERE object_name IS NOT NULL\n   AND event_name LIKE \'wait/io/file/%\'\n ORDER BY timer_start;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`information_schema`.`processlist`.`ID` is null,concat(substring_index(`performance_schema`.`threads`.`NAME`,\'/\',-1),\':\',`performance_schema`.`events_waits_history_long`.`THREAD_ID`),concat(`information_schema`.`processlist`.`USER`,\'@\',`information_schema`.`processlist`.`HOST`,\':\',`information_schema`.`processlist`.`ID`)) AS `thread`,`performance_schema`.`events_waits_history_long`.`OBJECT_NAME` AS `file`,`performance_schema`.`events_waits_history_long`.`TIMER_WAIT` AS `latency`,`performance_schema`.`events_waits_history_long`.`OPERATION` AS `operation`,`performance_schema`.`events_waits_history_long`.`NUMBER_OF_BYTES` AS `requested` from ((`performance_schema`.`events_waits_history_long` join `performance_schema`.`threads` on(`performance_schema`.`events_waits_history_long`.`THREAD_ID` = `performance_schema`.`threads`.`THREAD_ID`)) left join `information_schema`.`processlist` on(`performance_schema`.`threads`.`PROCESSLIST_ID` = `information_schema`.`processlist`.`ID`)) where `performance_schema`.`events_waits_history_long`.`OBJECT_NAME` is not null and `performance_schema`.`events_waits_history_long`.`EVENT_NAME` like \'wait/io/file/%\' order by `performance_schema`.`events_waits_history_long`.`TIMER_START`
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024memory_by_host_by_current_bytes.frm b/mariadb/sys/x@0024memory_by_host_by_current_bytes.frm
new file mode 100644
index 000000000..26b57346c
--- /dev/null
+++ b/mariadb/sys/x@0024memory_by_host_by_current_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_COUNT_USED`) AS `current_count_used`,sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_allocated`,ifnull(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_COUNT_USED`),0),0) AS `current_avg_alloc`,max(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_max_alloc`,sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`SUM_NUMBER_OF_BYTES_ALLOC`) AS `total_allocated` from `performance_schema`.`memory_summary_by_host_by_event_name` group by if(`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+md5=8830b3e5e58a5783b9ac513f099e5590
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647124044
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       SUM(current_count_used) AS current_count_used,\n       SUM(current_number_of_bytes_used) AS current_allocated,\n       IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0) AS current_avg_alloc,\n       MAX(current_number_of_bytes_used) AS current_max_alloc,\n       SUM(sum_number_of_bytes_alloc) AS total_allocated\n  FROM performance_schema.memory_summary_by_host_by_event_name\n GROUP BY IF(host IS NULL, \'background\', host)\n ORDER BY SUM(current_number_of_bytes_used) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST`) AS `host`,sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_COUNT_USED`) AS `current_count_used`,sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_allocated`,ifnull(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_COUNT_USED`),0),0) AS `current_avg_alloc`,max(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_max_alloc`,sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`SUM_NUMBER_OF_BYTES_ALLOC`) AS `total_allocated` from `performance_schema`.`memory_summary_by_host_by_event_name` group by if(`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`memory_summary_by_host_by_event_name`.`HOST`) order by sum(`performance_schema`.`memory_summary_by_host_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024memory_by_thread_by_current_bytes.frm b/mariadb/sys/x@0024memory_by_thread_by_current_bytes.frm
new file mode 100644
index 000000000..b21ff652f
--- /dev/null
+++ b/mariadb/sys/x@0024memory_by_thread_by_current_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `t`.`THREAD_ID` AS `thread_id`,if(`t`.`NAME` = \'thread/sql/one_connection\',concat(`t`.`PROCESSLIST_USER`,\'@\',`t`.`PROCESSLIST_HOST`),replace(`t`.`NAME`,\'thread/\',\'\')) AS `user`,sum(`mt`.`CURRENT_COUNT_USED`) AS `current_count_used`,sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_allocated`,ifnull(sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`mt`.`CURRENT_COUNT_USED`),0),0) AS `current_avg_alloc`,max(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_max_alloc`,sum(`mt`.`SUM_NUMBER_OF_BYTES_ALLOC`) AS `total_allocated` from (`performance_schema`.`memory_summary_by_thread_by_event_name` `mt` join `performance_schema`.`threads` `t` on(`mt`.`THREAD_ID` = `t`.`THREAD_ID`)) group by `t`.`THREAD_ID`,if(`t`.`NAME` = \'thread/sql/one_connection\',concat(`t`.`PROCESSLIST_USER`,\'@\',`t`.`PROCESSLIST_HOST`),replace(`t`.`NAME`,\'thread/\',\'\')) order by sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+md5=090446b6a45d058a679ed900e7b94967
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647265843
+create-version=2
+source=SELECT t.thread_id,\n       IF(t.name = \'thread/sql/one_connection\',\n          CONCAT(t.processlist_user, \'@\', t.processlist_host),\n          REPLACE(t.name, \'thread/\', \'\')) user,\n       SUM(mt.current_count_used) AS current_count_used,\n       SUM(mt.current_number_of_bytes_used) AS current_allocated,\n       IFNULL(SUM(mt.current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0) AS current_avg_alloc,\n       MAX(mt.current_number_of_bytes_used) AS current_max_alloc,\n       SUM(mt.sum_number_of_bytes_alloc) AS total_allocated\n  FROM performance_schema.memory_summary_by_thread_by_event_name AS mt\n  JOIN performance_schema.threads AS t USING (thread_id)\n GROUP BY thread_id, IF(t.name = \'thread/sql/one_connection\',\n          CONCAT(t.processlist_user, \'@\', t.processlist_host),\n          REPLACE(t.name, \'thread/\', \'\'))\n ORDER BY SUM(mt.current_number_of_bytes_used) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `t`.`THREAD_ID` AS `thread_id`,if(`t`.`NAME` = \'thread/sql/one_connection\',concat(`t`.`PROCESSLIST_USER`,\'@\',`t`.`PROCESSLIST_HOST`),replace(`t`.`NAME`,\'thread/\',\'\')) AS `user`,sum(`mt`.`CURRENT_COUNT_USED`) AS `current_count_used`,sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_allocated`,ifnull(sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`mt`.`CURRENT_COUNT_USED`),0),0) AS `current_avg_alloc`,max(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_max_alloc`,sum(`mt`.`SUM_NUMBER_OF_BYTES_ALLOC`) AS `total_allocated` from (`performance_schema`.`memory_summary_by_thread_by_event_name` `mt` join `performance_schema`.`threads` `t` on(`mt`.`THREAD_ID` = `t`.`THREAD_ID`)) group by `t`.`THREAD_ID`,if(`t`.`NAME` = \'thread/sql/one_connection\',concat(`t`.`PROCESSLIST_USER`,\'@\',`t`.`PROCESSLIST_HOST`),replace(`t`.`NAME`,\'thread/\',\'\')) order by sum(`mt`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024memory_by_user_by_current_bytes.frm b/mariadb/sys/x@0024memory_by_user_by_current_bytes.frm
new file mode 100644
index 000000000..a499b7a19
--- /dev/null
+++ b/mariadb/sys/x@0024memory_by_user_by_current_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`memory_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`memory_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_COUNT_USED`) AS `current_count_used`,sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_allocated`,ifnull(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_COUNT_USED`),0),0) AS `current_avg_alloc`,max(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_max_alloc`,sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`SUM_NUMBER_OF_BYTES_ALLOC`) AS `total_allocated` from `performance_schema`.`memory_summary_by_user_by_event_name` group by if(`performance_schema`.`memory_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`memory_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+md5=2ae77cc919014e48af09252ebc44d28b
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153646974034
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       SUM(current_count_used) AS current_count_used,\n       SUM(current_number_of_bytes_used) AS current_allocated,\n       IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0) AS current_avg_alloc,\n       MAX(current_number_of_bytes_used) AS current_max_alloc,\n       SUM(sum_number_of_bytes_alloc) AS total_allocated\n  FROM performance_schema.memory_summary_by_user_by_event_name\n GROUP BY IF(user IS NULL, \'background\', user)\n ORDER BY SUM(current_number_of_bytes_used) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`memory_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`memory_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_COUNT_USED`) AS `current_count_used`,sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_allocated`,ifnull(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) / nullif(sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_COUNT_USED`),0),0) AS `current_avg_alloc`,max(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `current_max_alloc`,sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`SUM_NUMBER_OF_BYTES_ALLOC`) AS `total_allocated` from `performance_schema`.`memory_summary_by_user_by_event_name` group by if(`performance_schema`.`memory_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`memory_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`memory_summary_by_user_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024memory_global_by_current_bytes.frm b/mariadb/sys/x@0024memory_global_by_current_bytes.frm
new file mode 100644
index 000000000..2b953001d
--- /dev/null
+++ b/mariadb/sys/x@0024memory_global_by_current_bytes.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`memory_summary_global_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_COUNT_USED` AS `current_count`,`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` AS `current_alloc`,ifnull(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` / nullif(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_COUNT_USED`,0),0) AS `current_avg_alloc`,`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_COUNT_USED` AS `high_count`,`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_NUMBER_OF_BYTES_USED` AS `high_alloc`,ifnull(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_NUMBER_OF_BYTES_USED` / nullif(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_COUNT_USED`,0),0) AS `high_avg_alloc` from `performance_schema`.`memory_summary_global_by_event_name` where `performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` > 0 order by `performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` desc
+md5=de3d03378b143da6e5496c82721af418
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647432476
+create-version=2
+source=SELECT event_name,\n       current_count_used AS current_count,\n       current_number_of_bytes_used AS current_alloc,\n       IFNULL(current_number_of_bytes_used / NULLIF(current_count_used, 0), 0) AS current_avg_alloc,\n       high_count_used AS high_count,\n       high_number_of_bytes_used AS high_alloc,\n       IFNULL(high_number_of_bytes_used / NULLIF(high_count_used, 0), 0) AS high_avg_alloc\n  FROM performance_schema.memory_summary_global_by_event_name\n WHERE current_number_of_bytes_used > 0\n ORDER BY current_number_of_bytes_used DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`memory_summary_global_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_COUNT_USED` AS `current_count`,`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` AS `current_alloc`,ifnull(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` / nullif(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_COUNT_USED`,0),0) AS `current_avg_alloc`,`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_COUNT_USED` AS `high_count`,`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_NUMBER_OF_BYTES_USED` AS `high_alloc`,ifnull(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_NUMBER_OF_BYTES_USED` / nullif(`performance_schema`.`memory_summary_global_by_event_name`.`HIGH_COUNT_USED`,0),0) AS `high_avg_alloc` from `performance_schema`.`memory_summary_global_by_event_name` where `performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` > 0 order by `performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024memory_global_total.frm b/mariadb/sys/x@0024memory_global_total.frm
new file mode 100644
index 000000000..abb7e0f39
--- /dev/null
+++ b/mariadb/sys/x@0024memory_global_total.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select sum(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `total_allocated` from `performance_schema`.`memory_summary_global_by_event_name`
+md5=6f943b5a93d4d8b6c06840dbfa5027a9
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647582558
+create-version=2
+source=SELECT SUM(CURRENT_NUMBER_OF_BYTES_USED) total_allocated\n  FROM performance_schema.memory_summary_global_by_event_name;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select sum(`performance_schema`.`memory_summary_global_by_event_name`.`CURRENT_NUMBER_OF_BYTES_USED`) AS `total_allocated` from `performance_schema`.`memory_summary_global_by_event_name`
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024processlist.frm b/mariadb/sys/x@0024processlist.frm
new file mode 100644
index 000000000..49c24f990
--- /dev/null
+++ b/mariadb/sys/x@0024processlist.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `pps`.`THREAD_ID` AS `thd_id`,`pps`.`PROCESSLIST_ID` AS `conn_id`,if(`pps`.`NAME` = \'thread/sql/one_connection\',concat(`pps`.`PROCESSLIST_USER`,\'@\',`pps`.`PROCESSLIST_HOST`),replace(`pps`.`NAME`,\'thread/\',\'\')) AS `user`,`pps`.`PROCESSLIST_DB` AS `db`,`pps`.`PROCESSLIST_COMMAND` AS `command`,`pps`.`PROCESSLIST_STATE` AS `state`,`pps`.`PROCESSLIST_TIME` AS `time`,`pps`.`PROCESSLIST_INFO` AS `current_statement`,if(`esc`.`END_EVENT_ID` is null,`esc`.`TIMER_WAIT`,NULL) AS `statement_latency`,if(`esc`.`END_EVENT_ID` is null,round(100 * (`estc`.`WORK_COMPLETED` / `estc`.`WORK_ESTIMATED`),2),NULL) AS `progress`,`esc`.`LOCK_TIME` AS `lock_latency`,`esc`.`ROWS_EXAMINED` AS `rows_examined`,`esc`.`ROWS_SENT` AS `rows_sent`,`esc`.`ROWS_AFFECTED` AS `rows_affected`,`esc`.`CREATED_TMP_TABLES` AS `tmp_tables`,`esc`.`CREATED_TMP_DISK_TABLES` AS `tmp_disk_tables`,if(`esc`.`NO_GOOD_INDEX_USED` > 0 or `esc`.`NO_INDEX_USED` > 0,\'YES\',\'NO\') AS `full_scan`,if(`esc`.`END_EVENT_ID` is not null,`esc`.`SQL_TEXT`,NULL) AS `last_statement`,if(`esc`.`END_EVENT_ID` is not null,`esc`.`TIMER_WAIT`,NULL) AS `last_statement_latency`,`mem`.`current_allocated` AS `current_memory`,`ewc`.`EVENT_NAME` AS `last_wait`,if(`ewc`.`END_EVENT_ID` is null and `ewc`.`EVENT_NAME` is not null,\'Still Waiting\',`ewc`.`TIMER_WAIT`) AS `last_wait_latency`,`ewc`.`SOURCE` AS `source`,`etc`.`TIMER_WAIT` AS `trx_latency`,`etc`.`STATE` AS `trx_state`,`etc`.`AUTOCOMMIT` AS `trx_autocommit`,`conattr_pid`.`ATTR_VALUE` AS `pid`,`conattr_progname`.`ATTR_VALUE` AS `program_name` from (((((((`performance_schema`.`threads` `pps` left join `performance_schema`.`events_waits_current` `ewc` on(`pps`.`THREAD_ID` = `ewc`.`THREAD_ID`)) left join `performance_schema`.`events_stages_current` `estc` on(`pps`.`THREAD_ID` = `estc`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `esc` on(`pps`.`THREAD_ID` = `esc`.`THREAD_ID`)) left join `performance_schema`.`events_transactions_current` `etc` on(`pps`.`THREAD_ID` = `etc`.`THREAD_ID`)) left join `sys`.`x$memory_by_thread_by_current_bytes` `mem` on(`pps`.`THREAD_ID` = `mem`.`thread_id`)) left join `performance_schema`.`session_connect_attrs` `conattr_pid` on(`conattr_pid`.`PROCESSLIST_ID` = `pps`.`PROCESSLIST_ID` and `conattr_pid`.`ATTR_NAME` = \'_pid\')) left join `performance_schema`.`session_connect_attrs` `conattr_progname` on(`conattr_progname`.`PROCESSLIST_ID` = `pps`.`PROCESSLIST_ID` and `conattr_progname`.`ATTR_NAME` = \'program_name\')) order by `pps`.`PROCESSLIST_TIME` desc,if(`ewc`.`END_EVENT_ID` is null and `ewc`.`EVENT_NAME` is not null,\'Still Waiting\',`ewc`.`TIMER_WAIT`) desc
+md5=42b975f81c88e5010bd88768cd426eb7
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652899445
+create-version=2
+source=SELECT pps.thread_id AS thd_id,\n       pps.processlist_id AS conn_id,\n       IF(pps.name = \'thread/sql/one_connection\',\n          CONCAT(pps.processlist_user, \'@\', pps.processlist_host),\n          REPLACE(pps.name, \'thread/\', \'\')) user,\n       pps.processlist_db AS db,\n       pps.processlist_command AS command,\n       pps.processlist_state AS state,\n       pps.processlist_time AS time,\n       pps.processlist_info AS current_statement,\n       IF(esc.end_event_id IS NULL,\n          esc.timer_wait,\n          NULL) AS statement_latency,\n       IF(esc.end_event_id IS NULL,\n          ROUND(100 * (estc.work_completed / estc.work_estimated), 2),\n          NULL) AS progress,\n       esc.lock_time AS lock_latency,\n       esc.rows_examined AS rows_examined,\n       esc.rows_sent AS rows_sent,\n       esc.rows_affected AS rows_affected,\n       esc.created_tmp_tables AS tmp_tables,\n       esc.created_tmp_disk_tables AS tmp_disk_tables,\n       IF(esc.no_good_index_used > 0 OR esc.no_index_used > 0, \'YES\', \'NO\') AS full_scan,\n       IF(esc.end_event_id IS NOT NULL,\n          esc.sql_text,\n          NULL) AS last_statement,\n       IF(esc.end_event_id IS NOT NULL,\n          esc.timer_wait,\n          NULL) AS last_statement_latency,\n       mem.current_allocated AS current_memory,\n       ewc.event_name AS last_wait,\n       IF(ewc.end_event_id IS NULL AND ewc.event_name IS NOT NULL,\n          \'Still Waiting\',\n          ewc.timer_wait) last_wait_latency,\n       ewc.source,\n       etc.timer_wait AS trx_latency,\n       etc.state AS trx_state,\n       etc.autocommit AS trx_autocommit,\n       conattr_pid.attr_value as pid,\n       conattr_progname.attr_value as program_name\n  FROM performance_schema.threads AS pps\n  LEFT JOIN performance_schema.events_waits_current AS ewc USING (thread_id)\n  LEFT JOIN performance_schema.events_stages_current AS estc USING (thread_id)\n  LEFT JOIN performance_schema.events_statements_current AS esc USING (thread_id)\n  LEFT JOIN performance_schema.events_transactions_current AS etc USING (thread_id)\n  LEFT JOIN sys.x$memory_by_thread_by_current_bytes AS mem USING (thread_id)\n  LEFT JOIN performance_schema.session_connect_attrs AS conattr_pid\n    ON conattr_pid.processlist_id=pps.processlist_id and conattr_pid.attr_name=\'_pid\'\n  LEFT JOIN performance_schema.session_connect_attrs AS conattr_progname\n    ON conattr_progname.processlist_id=pps.processlist_id and conattr_progname.attr_name=\'program_name\'\n ORDER BY pps.processlist_time DESC, last_wait_latency DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `pps`.`THREAD_ID` AS `thd_id`,`pps`.`PROCESSLIST_ID` AS `conn_id`,if(`pps`.`NAME` = \'thread/sql/one_connection\',concat(`pps`.`PROCESSLIST_USER`,\'@\',`pps`.`PROCESSLIST_HOST`),replace(`pps`.`NAME`,\'thread/\',\'\')) AS `user`,`pps`.`PROCESSLIST_DB` AS `db`,`pps`.`PROCESSLIST_COMMAND` AS `command`,`pps`.`PROCESSLIST_STATE` AS `state`,`pps`.`PROCESSLIST_TIME` AS `time`,`pps`.`PROCESSLIST_INFO` AS `current_statement`,if(`esc`.`END_EVENT_ID` is null,`esc`.`TIMER_WAIT`,NULL) AS `statement_latency`,if(`esc`.`END_EVENT_ID` is null,round(100 * (`estc`.`WORK_COMPLETED` / `estc`.`WORK_ESTIMATED`),2),NULL) AS `progress`,`esc`.`LOCK_TIME` AS `lock_latency`,`esc`.`ROWS_EXAMINED` AS `rows_examined`,`esc`.`ROWS_SENT` AS `rows_sent`,`esc`.`ROWS_AFFECTED` AS `rows_affected`,`esc`.`CREATED_TMP_TABLES` AS `tmp_tables`,`esc`.`CREATED_TMP_DISK_TABLES` AS `tmp_disk_tables`,if(`esc`.`NO_GOOD_INDEX_USED` > 0 or `esc`.`NO_INDEX_USED` > 0,\'YES\',\'NO\') AS `full_scan`,if(`esc`.`END_EVENT_ID` is not null,`esc`.`SQL_TEXT`,NULL) AS `last_statement`,if(`esc`.`END_EVENT_ID` is not null,`esc`.`TIMER_WAIT`,NULL) AS `last_statement_latency`,`mem`.`current_allocated` AS `current_memory`,`ewc`.`EVENT_NAME` AS `last_wait`,if(`ewc`.`END_EVENT_ID` is null and `ewc`.`EVENT_NAME` is not null,\'Still Waiting\',`ewc`.`TIMER_WAIT`) AS `last_wait_latency`,`ewc`.`SOURCE` AS `source`,`etc`.`TIMER_WAIT` AS `trx_latency`,`etc`.`STATE` AS `trx_state`,`etc`.`AUTOCOMMIT` AS `trx_autocommit`,`conattr_pid`.`ATTR_VALUE` AS `pid`,`conattr_progname`.`ATTR_VALUE` AS `program_name` from (((((((`performance_schema`.`threads` `pps` left join `performance_schema`.`events_waits_current` `ewc` on(`pps`.`THREAD_ID` = `ewc`.`THREAD_ID`)) left join `performance_schema`.`events_stages_current` `estc` on(`pps`.`THREAD_ID` = `estc`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `esc` on(`pps`.`THREAD_ID` = `esc`.`THREAD_ID`)) left join `performance_schema`.`events_transactions_current` `etc` on(`pps`.`THREAD_ID` = `etc`.`THREAD_ID`)) left join `sys`.`x$memory_by_thread_by_current_bytes` `mem` on(`pps`.`THREAD_ID` = `mem`.`thread_id`)) left join `performance_schema`.`session_connect_attrs` `conattr_pid` on(`conattr_pid`.`PROCESSLIST_ID` = `pps`.`PROCESSLIST_ID` and `conattr_pid`.`ATTR_NAME` = \'_pid\')) left join `performance_schema`.`session_connect_attrs` `conattr_progname` on(`conattr_progname`.`PROCESSLIST_ID` = `pps`.`PROCESSLIST_ID` and `conattr_progname`.`ATTR_NAME` = \'program_name\')) order by `pps`.`PROCESSLIST_TIME` desc,if(`ewc`.`END_EVENT_ID` is null and `ewc`.`EVENT_NAME` is not null,\'Still Waiting\',`ewc`.`TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024ps_digest_95th_percentile_by_avg_us.frm b/mariadb/sys/x@0024ps_digest_95th_percentile_by_avg_us.frm
new file mode 100644
index 000000000..1c60a4ff5
--- /dev/null
+++ b/mariadb/sys/x@0024ps_digest_95th_percentile_by_avg_us.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `s2`.`avg_us` AS `avg_us`,ifnull(sum(`s1`.`cnt`) / nullif((select count(0) from `performance_schema`.`events_statements_summary_by_digest`),0),0) AS `percentile` from (`sys`.`x$ps_digest_avg_latency_distribution` `s1` join `sys`.`x$ps_digest_avg_latency_distribution` `s2` on(`s1`.`avg_us` <= `s2`.`avg_us`)) group by `s2`.`avg_us` having ifnull(sum(`s1`.`cnt`) / nullif((select count(0) from `performance_schema`.`events_statements_summary_by_digest`),0),0) > 0.95 order by ifnull(sum(`s1`.`cnt`) / nullif((select count(0) from `performance_schema`.`events_statements_summary_by_digest`),0),0) limit 1
+md5=9d4c91bfffb022a4413bbda627e2c569
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649290872
+create-version=2
+source=SELECT s2.avg_us avg_us,\n       IFNULL(SUM(s1.cnt)/NULLIF((SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest), 0), 0) percentile\n  FROM sys.x$ps_digest_avg_latency_distribution AS s1\n  JOIN sys.x$ps_digest_avg_latency_distribution AS s2\n    ON s1.avg_us <= s2.avg_us\n GROUP BY s2.avg_us\nHAVING IFNULL(SUM(s1.cnt)/NULLIF((SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest), 0), 0) > 0.95\n ORDER BY percentile\n LIMIT 1;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `s2`.`avg_us` AS `avg_us`,ifnull(sum(`s1`.`cnt`) / nullif((select count(0) from `performance_schema`.`events_statements_summary_by_digest`),0),0) AS `percentile` from (`sys`.`x$ps_digest_avg_latency_distribution` `s1` join `sys`.`x$ps_digest_avg_latency_distribution` `s2` on(`s1`.`avg_us` <= `s2`.`avg_us`)) group by `s2`.`avg_us` having ifnull(sum(`s1`.`cnt`) / nullif((select count(0) from `performance_schema`.`events_statements_summary_by_digest`),0),0) > 0.95 order by ifnull(sum(`s1`.`cnt`) / nullif((select count(0) from `performance_schema`.`events_statements_summary_by_digest`),0),0) limit 1
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024ps_digest_avg_latency_distribution.frm b/mariadb/sys/x@0024ps_digest_avg_latency_distribution.frm
new file mode 100644
index 000000000..909503e1b
--- /dev/null
+++ b/mariadb/sys/x@0024ps_digest_avg_latency_distribution.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select count(0) AS `cnt`,round(`performance_schema`.`events_statements_summary_by_digest`.`AVG_TIMER_WAIT` / 1000000,0) AS `avg_us` from `performance_schema`.`events_statements_summary_by_digest` group by round(`performance_schema`.`events_statements_summary_by_digest`.`AVG_TIMER_WAIT` / 1000000,0)
+md5=90f26794b9a8e64fa4b20b5972595230
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649191019
+create-version=2
+source=SELECT COUNT(*) cnt,\n       ROUND(avg_timer_wait/1000000) AS avg_us\n  FROM performance_schema.events_statements_summary_by_digest\n GROUP BY avg_us;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select count(0) AS `cnt`,round(`performance_schema`.`events_statements_summary_by_digest`.`AVG_TIMER_WAIT` / 1000000,0) AS `avg_us` from `performance_schema`.`events_statements_summary_by_digest` group by round(`performance_schema`.`events_statements_summary_by_digest`.`AVG_TIMER_WAIT` / 1000000,0)
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024ps_schema_table_statistics_io.frm b/mariadb/sys/x@0024ps_schema_table_statistics_io.frm
new file mode 100644
index 000000000..45418cba0
--- /dev/null
+++ b/mariadb/sys/x@0024ps_schema_table_statistics_io.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `extract_schema_from_file_name`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`) AS `table_schema`,`extract_table_from_file_name`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`) AS `table_name`,sum(`performance_schema`.`file_summary_by_instance`.`COUNT_READ`) AS `count_read`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ`) AS `sum_number_of_bytes_read`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_READ`) AS `sum_timer_read`,sum(`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE`) AS `count_write`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `sum_number_of_bytes_write`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WRITE`) AS `sum_timer_write`,sum(`performance_schema`.`file_summary_by_instance`.`COUNT_MISC`) AS `count_misc`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_MISC`) AS `sum_timer_misc` from `performance_schema`.`file_summary_by_instance` group by `extract_schema_from_file_name`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`),`extract_table_from_file_name`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`)
+md5=1cbc73d7bab53e57bfac894c9697fd30
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647807679
+create-version=2
+source=SELECT extract_schema_from_file_name(file_name) AS table_schema,\n       extract_table_from_file_name(file_name) AS table_name,\n       SUM(count_read) AS count_read,\n       SUM(sum_number_of_bytes_read) AS sum_number_of_bytes_read,\n       SUM(sum_timer_read) AS sum_timer_read,\n       SUM(count_write) AS count_write,\n       SUM(sum_number_of_bytes_write) AS sum_number_of_bytes_write,\n       SUM(sum_timer_write) AS sum_timer_write,\n       SUM(count_misc) AS count_misc,\n       SUM(sum_timer_misc) AS sum_timer_misc\n  FROM performance_schema.file_summary_by_instance\n GROUP BY table_schema, table_name;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `extract_schema_from_file_name`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`) AS `table_schema`,`extract_table_from_file_name`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`) AS `table_name`,sum(`performance_schema`.`file_summary_by_instance`.`COUNT_READ`) AS `count_read`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_READ`) AS `sum_number_of_bytes_read`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_READ`) AS `sum_timer_read`,sum(`performance_schema`.`file_summary_by_instance`.`COUNT_WRITE`) AS `count_write`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_NUMBER_OF_BYTES_WRITE`) AS `sum_number_of_bytes_write`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_WRITE`) AS `sum_timer_write`,sum(`performance_schema`.`file_summary_by_instance`.`COUNT_MISC`) AS `count_misc`,sum(`performance_schema`.`file_summary_by_instance`.`SUM_TIMER_MISC`) AS `sum_timer_misc` from `performance_schema`.`file_summary_by_instance` group by `extract_schema_from_file_name`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`),`extract_table_from_file_name`(`performance_schema`.`file_summary_by_instance`.`FILE_NAME`)
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024schema_flattened_keys.frm b/mariadb/sys/x@0024schema_flattened_keys.frm
new file mode 100644
index 000000000..7f218a6f9
--- /dev/null
+++ b/mariadb/sys/x@0024schema_flattened_keys.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `information_schema`.`STATISTICS`.`TABLE_SCHEMA` AS `table_schema`,`information_schema`.`STATISTICS`.`TABLE_NAME` AS `table_name`,`information_schema`.`STATISTICS`.`INDEX_NAME` AS `index_name`,max(`information_schema`.`STATISTICS`.`NON_UNIQUE`) AS `non_unique`,max(if(`information_schema`.`STATISTICS`.`SUB_PART` is null,0,1)) AS `subpart_exists`,group_concat(`information_schema`.`STATISTICS`.`COLUMN_NAME` order by `information_schema`.`STATISTICS`.`SEQ_IN_INDEX` ASC separator \',\') AS `index_columns` from `INFORMATION_SCHEMA`.`STATISTICS` where `information_schema`.`STATISTICS`.`INDEX_TYPE` = \'BTREE\' and `information_schema`.`STATISTICS`.`TABLE_SCHEMA` not in (\'mysql\',\'sys\',\'INFORMATION_SCHEMA\',\'PERFORMANCE_SCHEMA\') group by `information_schema`.`STATISTICS`.`TABLE_SCHEMA`,`information_schema`.`STATISTICS`.`TABLE_NAME`,`information_schema`.`STATISTICS`.`INDEX_NAME`
+md5=e009f14e47310b8c3894338840733af0
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153645740809
+create-version=2
+source=SELECT\n    TABLE_SCHEMA,\n    TABLE_NAME,\n    INDEX_NAME,\n    MAX(NON_UNIQUE) AS non_unique,\n    MAX(IF(SUB_PART IS NULL, 0, 1)) AS subpart_exists,\n    GROUP_CONCAT(COLUMN_NAME ORDER BY SEQ_IN_INDEX) AS index_columns\n  FROM INFORMATION_SCHEMA.STATISTICS\n  WHERE\n    INDEX_TYPE=\'BTREE\'\n    AND TABLE_SCHEMA NOT IN (\'mysql\', \'sys\', \'INFORMATION_SCHEMA\', \'PERFORMANCE_SCHEMA\')\n  GROUP BY\n    TABLE_SCHEMA, TABLE_NAME, INDEX_NAME;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `information_schema`.`STATISTICS`.`TABLE_SCHEMA` AS `table_schema`,`information_schema`.`STATISTICS`.`TABLE_NAME` AS `table_name`,`information_schema`.`STATISTICS`.`INDEX_NAME` AS `index_name`,max(`information_schema`.`STATISTICS`.`NON_UNIQUE`) AS `non_unique`,max(if(`information_schema`.`STATISTICS`.`SUB_PART` is null,0,1)) AS `subpart_exists`,group_concat(`information_schema`.`STATISTICS`.`COLUMN_NAME` order by `information_schema`.`STATISTICS`.`SEQ_IN_INDEX` ASC separator \',\') AS `index_columns` from `INFORMATION_SCHEMA`.`STATISTICS` where `information_schema`.`STATISTICS`.`INDEX_TYPE` = \'BTREE\' and `information_schema`.`STATISTICS`.`TABLE_SCHEMA` not in (\'mysql\',\'sys\',\'INFORMATION_SCHEMA\',\'PERFORMANCE_SCHEMA\') group by `information_schema`.`STATISTICS`.`TABLE_SCHEMA`,`information_schema`.`STATISTICS`.`TABLE_NAME`,`information_schema`.`STATISTICS`.`INDEX_NAME`
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024schema_index_statistics.frm b/mariadb/sys/x@0024schema_index_statistics.frm
new file mode 100644
index 000000000..b2f0eb38f
--- /dev/null
+++ b/mariadb/sys/x@0024schema_index_statistics.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `table_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `table_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` AS `index_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_FETCH` AS `rows_selected`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_FETCH` AS `select_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_INSERT` AS `rows_inserted`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_INSERT` AS `insert_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_UPDATE` AS `rows_updated`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_UPDATE` AS `update_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_DELETE` AS `rows_deleted`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_INSERT` AS `delete_latency` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is not null order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_WAIT` desc
+md5=5844eee9b3fc97a283ca9e10e94f2258
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647732619
+create-version=2
+source=SELECT OBJECT_SCHEMA AS table_schema,\n       OBJECT_NAME AS table_name,\n       INDEX_NAME as index_name,\n       COUNT_FETCH AS rows_selected,\n       SUM_TIMER_FETCH AS select_latency,\n       COUNT_INSERT AS rows_inserted,\n       SUM_TIMER_INSERT AS insert_latency,\n       COUNT_UPDATE AS rows_updated,\n       SUM_TIMER_UPDATE AS update_latency,\n       COUNT_DELETE AS rows_deleted,\n       SUM_TIMER_INSERT AS delete_latency\n  FROM performance_schema.table_io_waits_summary_by_index_usage\n WHERE index_name IS NOT NULL\n ORDER BY sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `table_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `table_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` AS `index_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_FETCH` AS `rows_selected`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_FETCH` AS `select_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_INSERT` AS `rows_inserted`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_INSERT` AS `insert_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_UPDATE` AS `rows_updated`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_UPDATE` AS `update_latency`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_DELETE` AS `rows_deleted`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_INSERT` AS `delete_latency` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is not null order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024schema_table_lock_waits.frm b/mariadb/sys/x@0024schema_table_lock_waits.frm
new file mode 100644
index 000000000..a809a02a3
--- /dev/null
+++ b/mariadb/sys/x@0024schema_table_lock_waits.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `g`.`OBJECT_SCHEMA` AS `object_schema`,`g`.`OBJECT_NAME` AS `object_name`,`pt`.`THREAD_ID` AS `waiting_thread_id`,`pt`.`PROCESSLIST_ID` AS `waiting_pid`,`sys`.`ps_thread_account`(`p`.`OWNER_THREAD_ID`) AS `waiting_account`,`p`.`LOCK_TYPE` AS `waiting_lock_type`,`p`.`LOCK_DURATION` AS `waiting_lock_duration`,`pt`.`PROCESSLIST_INFO` AS `waiting_query`,`pt`.`PROCESSLIST_TIME` AS `waiting_query_secs`,`ps`.`ROWS_AFFECTED` AS `waiting_query_rows_affected`,`ps`.`ROWS_EXAMINED` AS `waiting_query_rows_examined`,`gt`.`THREAD_ID` AS `blocking_thread_id`,`gt`.`PROCESSLIST_ID` AS `blocking_pid`,`sys`.`ps_thread_account`(`g`.`OWNER_THREAD_ID`) AS `blocking_account`,`g`.`LOCK_TYPE` AS `blocking_lock_type`,`g`.`LOCK_DURATION` AS `blocking_lock_duration`,concat(\'KILL QUERY \',`gt`.`PROCESSLIST_ID`) AS `sql_kill_blocking_query`,concat(\'KILL \',`gt`.`PROCESSLIST_ID`) AS `sql_kill_blocking_connection` from (((((`performance_schema`.`metadata_locks` `g` join `performance_schema`.`metadata_locks` `p` on(`g`.`OBJECT_TYPE` = `p`.`OBJECT_TYPE` and `g`.`OBJECT_SCHEMA` = `p`.`OBJECT_SCHEMA` and `g`.`OBJECT_NAME` = `p`.`OBJECT_NAME` and `g`.`LOCK_STATUS` = \'GRANTED\' and `p`.`LOCK_STATUS` = \'PENDING\')) join `performance_schema`.`threads` `gt` on(`g`.`OWNER_THREAD_ID` = `gt`.`THREAD_ID`)) join `performance_schema`.`threads` `pt` on(`p`.`OWNER_THREAD_ID` = `pt`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `gs` on(`g`.`OWNER_THREAD_ID` = `gs`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `ps` on(`p`.`OWNER_THREAD_ID` = `ps`.`THREAD_ID`)) where `g`.`OBJECT_TYPE` = \'TABLE\'
+md5=9bde9b7793a0d9ebd1c022f6e54a7ae2
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648507650
+create-version=2
+source=SELECT g.object_schema AS object_schema,\n       g.object_name AS object_name,\n       pt.thread_id AS waiting_thread_id,\n       pt.processlist_id AS waiting_pid,\n       sys.ps_thread_account(p.owner_thread_id) AS waiting_account,\n       p.lock_type AS waiting_lock_type,\n       p.lock_duration AS waiting_lock_duration,\n       pt.processlist_info AS waiting_query,\n       pt.processlist_time AS waiting_query_secs,\n       ps.rows_affected AS waiting_query_rows_affected,\n       ps.rows_examined AS waiting_query_rows_examined,\n       gt.thread_id AS blocking_thread_id,\n       gt.processlist_id AS blocking_pid,\n       sys.ps_thread_account(g.owner_thread_id) AS blocking_account,\n       g.lock_type AS blocking_lock_type,\n       g.lock_duration AS blocking_lock_duration,\n       CONCAT(\'KILL QUERY \', gt.processlist_id) AS sql_kill_blocking_query,\n       CONCAT(\'KILL \', gt.processlist_id) AS sql_kill_blocking_connection\n  FROM performance_schema.metadata_locks g\n INNER JOIN performance_schema.metadata_locks p\n    ON g.object_type = p.object_type\n   AND g.object_schema = p.object_schema\n   AND g.object_name = p.object_name\n   AND g.lock_status = \'GRANTED\'\n   AND p.lock_status = \'PENDING\'\n INNER JOIN performance_schema.threads gt ON g.owner_thread_id = gt.thread_id\n INNER JOIN performance_schema.threads pt ON p.owner_thread_id = pt.thread_id\n  LEFT JOIN performance_schema.events_statements_current gs ON g.owner_thread_id = gs.thread_id\n  LEFT JOIN performance_schema.events_statements_current ps ON p.owner_thread_id = ps.thread_id\n WHERE g.object_type = \'TABLE\';
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `g`.`OBJECT_SCHEMA` AS `object_schema`,`g`.`OBJECT_NAME` AS `object_name`,`pt`.`THREAD_ID` AS `waiting_thread_id`,`pt`.`PROCESSLIST_ID` AS `waiting_pid`,`sys`.`ps_thread_account`(`p`.`OWNER_THREAD_ID`) AS `waiting_account`,`p`.`LOCK_TYPE` AS `waiting_lock_type`,`p`.`LOCK_DURATION` AS `waiting_lock_duration`,`pt`.`PROCESSLIST_INFO` AS `waiting_query`,`pt`.`PROCESSLIST_TIME` AS `waiting_query_secs`,`ps`.`ROWS_AFFECTED` AS `waiting_query_rows_affected`,`ps`.`ROWS_EXAMINED` AS `waiting_query_rows_examined`,`gt`.`THREAD_ID` AS `blocking_thread_id`,`gt`.`PROCESSLIST_ID` AS `blocking_pid`,`sys`.`ps_thread_account`(`g`.`OWNER_THREAD_ID`) AS `blocking_account`,`g`.`LOCK_TYPE` AS `blocking_lock_type`,`g`.`LOCK_DURATION` AS `blocking_lock_duration`,concat(\'KILL QUERY \',`gt`.`PROCESSLIST_ID`) AS `sql_kill_blocking_query`,concat(\'KILL \',`gt`.`PROCESSLIST_ID`) AS `sql_kill_blocking_connection` from (((((`performance_schema`.`metadata_locks` `g` join `performance_schema`.`metadata_locks` `p` on(`g`.`OBJECT_TYPE` = `p`.`OBJECT_TYPE` and `g`.`OBJECT_SCHEMA` = `p`.`OBJECT_SCHEMA` and `g`.`OBJECT_NAME` = `p`.`OBJECT_NAME` and `g`.`LOCK_STATUS` = \'GRANTED\' and `p`.`LOCK_STATUS` = \'PENDING\')) join `performance_schema`.`threads` `gt` on(`g`.`OWNER_THREAD_ID` = `gt`.`THREAD_ID`)) join `performance_schema`.`threads` `pt` on(`p`.`OWNER_THREAD_ID` = `pt`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `gs` on(`g`.`OWNER_THREAD_ID` = `gs`.`THREAD_ID`)) left join `performance_schema`.`events_statements_current` `ps` on(`p`.`OWNER_THREAD_ID` = `ps`.`THREAD_ID`)) where `g`.`OBJECT_TYPE` = \'TABLE\'
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024schema_table_statistics.frm b/mariadb/sys/x@0024schema_table_statistics.frm
new file mode 100644
index 000000000..d274202ae
--- /dev/null
+++ b/mariadb/sys/x@0024schema_table_statistics.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `pst`.`OBJECT_SCHEMA` AS `table_schema`,`pst`.`OBJECT_NAME` AS `table_name`,`pst`.`SUM_TIMER_WAIT` AS `total_latency`,`pst`.`COUNT_FETCH` AS `rows_fetched`,`pst`.`SUM_TIMER_FETCH` AS `fetch_latency`,`pst`.`COUNT_INSERT` AS `rows_inserted`,`pst`.`SUM_TIMER_INSERT` AS `insert_latency`,`pst`.`COUNT_UPDATE` AS `rows_updated`,`pst`.`SUM_TIMER_UPDATE` AS `update_latency`,`pst`.`COUNT_DELETE` AS `rows_deleted`,`pst`.`SUM_TIMER_DELETE` AS `delete_latency`,`fsbi`.`count_read` AS `io_read_requests`,`fsbi`.`sum_number_of_bytes_read` AS `io_read`,`fsbi`.`sum_timer_read` AS `io_read_latency`,`fsbi`.`count_write` AS `io_write_requests`,`fsbi`.`sum_number_of_bytes_write` AS `io_write`,`fsbi`.`sum_timer_write` AS `io_write_latency`,`fsbi`.`count_misc` AS `io_misc_requests`,`fsbi`.`sum_timer_misc` AS `io_misc_latency` from (`performance_schema`.`table_io_waits_summary_by_table` `pst` left join `sys`.`x$ps_schema_table_statistics_io` `fsbi` on(`pst`.`OBJECT_SCHEMA` = `fsbi`.`table_schema` and `pst`.`OBJECT_NAME` = `fsbi`.`table_name`)) order by `pst`.`SUM_TIMER_WAIT` desc
+md5=bc53e98a227086ffb2e6185030b7fc95
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153647957488
+create-version=2
+source=SELECT pst.object_schema AS table_schema,\n       pst.object_name AS table_name,\n       pst.sum_timer_wait AS total_latency,\n       pst.count_fetch AS rows_fetched,\n       pst.sum_timer_fetch AS fetch_latency,\n       pst.count_insert AS rows_inserted,\n       pst.sum_timer_insert AS insert_latency,\n       pst.count_update AS rows_updated,\n       pst.sum_timer_update AS update_latency,\n       pst.count_delete AS rows_deleted,\n       pst.sum_timer_delete AS delete_latency,\n       fsbi.count_read AS io_read_requests,\n       fsbi.sum_number_of_bytes_read AS io_read,\n       fsbi.sum_timer_read AS io_read_latency,\n       fsbi.count_write AS io_write_requests,\n       fsbi.sum_number_of_bytes_write AS io_write,\n       fsbi.sum_timer_write AS io_write_latency,\n       fsbi.count_misc AS io_misc_requests,\n       fsbi.sum_timer_misc AS io_misc_latency\n  FROM performance_schema.table_io_waits_summary_by_table AS pst\n  LEFT JOIN x$ps_schema_table_statistics_io AS fsbi\n    ON pst.object_schema = fsbi.table_schema\n   AND pst.object_name = fsbi.table_name\n ORDER BY pst.sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `pst`.`OBJECT_SCHEMA` AS `table_schema`,`pst`.`OBJECT_NAME` AS `table_name`,`pst`.`SUM_TIMER_WAIT` AS `total_latency`,`pst`.`COUNT_FETCH` AS `rows_fetched`,`pst`.`SUM_TIMER_FETCH` AS `fetch_latency`,`pst`.`COUNT_INSERT` AS `rows_inserted`,`pst`.`SUM_TIMER_INSERT` AS `insert_latency`,`pst`.`COUNT_UPDATE` AS `rows_updated`,`pst`.`SUM_TIMER_UPDATE` AS `update_latency`,`pst`.`COUNT_DELETE` AS `rows_deleted`,`pst`.`SUM_TIMER_DELETE` AS `delete_latency`,`fsbi`.`count_read` AS `io_read_requests`,`fsbi`.`sum_number_of_bytes_read` AS `io_read`,`fsbi`.`sum_timer_read` AS `io_read_latency`,`fsbi`.`count_write` AS `io_write_requests`,`fsbi`.`sum_number_of_bytes_write` AS `io_write`,`fsbi`.`sum_timer_write` AS `io_write_latency`,`fsbi`.`count_misc` AS `io_misc_requests`,`fsbi`.`sum_timer_misc` AS `io_misc_latency` from (`performance_schema`.`table_io_waits_summary_by_table` `pst` left join `sys`.`x$ps_schema_table_statistics_io` `fsbi` on(`pst`.`OBJECT_SCHEMA` = `fsbi`.`table_schema` and `pst`.`OBJECT_NAME` = `fsbi`.`table_name`)) order by `pst`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024schema_table_statistics_with_buffer.frm b/mariadb/sys/x@0024schema_table_statistics_with_buffer.frm
new file mode 100644
index 000000000..94c15454d
--- /dev/null
+++ b/mariadb/sys/x@0024schema_table_statistics_with_buffer.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `pst`.`OBJECT_SCHEMA` AS `table_schema`,`pst`.`OBJECT_NAME` AS `table_name`,`pst`.`COUNT_FETCH` AS `rows_fetched`,`pst`.`SUM_TIMER_FETCH` AS `fetch_latency`,`pst`.`COUNT_INSERT` AS `rows_inserted`,`pst`.`SUM_TIMER_INSERT` AS `insert_latency`,`pst`.`COUNT_UPDATE` AS `rows_updated`,`pst`.`SUM_TIMER_UPDATE` AS `update_latency`,`pst`.`COUNT_DELETE` AS `rows_deleted`,`pst`.`SUM_TIMER_DELETE` AS `delete_latency`,`fsbi`.`count_read` AS `io_read_requests`,`fsbi`.`sum_number_of_bytes_read` AS `io_read`,`fsbi`.`sum_timer_read` AS `io_read_latency`,`fsbi`.`count_write` AS `io_write_requests`,`fsbi`.`sum_number_of_bytes_write` AS `io_write`,`fsbi`.`sum_timer_write` AS `io_write_latency`,`fsbi`.`count_misc` AS `io_misc_requests`,`fsbi`.`sum_timer_misc` AS `io_misc_latency`,`ibp`.`allocated` AS `innodb_buffer_allocated`,`ibp`.`data` AS `innodb_buffer_data`,`ibp`.`allocated` - `ibp`.`data` AS `innodb_buffer_free`,`ibp`.`pages` AS `innodb_buffer_pages`,`ibp`.`pages_hashed` AS `innodb_buffer_pages_hashed`,`ibp`.`pages_old` AS `innodb_buffer_pages_old`,`ibp`.`rows_cached` AS `innodb_buffer_rows_cached` from ((`performance_schema`.`table_io_waits_summary_by_table` `pst` left join `sys`.`x$ps_schema_table_statistics_io` `fsbi` on(`pst`.`OBJECT_SCHEMA` = `fsbi`.`table_schema` and `pst`.`OBJECT_NAME` = `fsbi`.`table_name`)) left join `sys`.`x$innodb_buffer_stats_by_table` `ibp` on(`pst`.`OBJECT_SCHEMA` = `ibp`.`object_schema` and `pst`.`OBJECT_NAME` = `ibp`.`object_name`)) order by `pst`.`SUM_TIMER_WAIT` desc
+md5=6028a2655b55a68d15450953ebc6eaae
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648107707
+create-version=2
+source=SELECT pst.object_schema AS table_schema,\n       pst.object_name AS table_name,\n       pst.count_fetch AS rows_fetched,\n       pst.sum_timer_fetch AS fetch_latency,\n       pst.count_insert AS rows_inserted,\n       pst.sum_timer_insert AS insert_latency,\n       pst.count_update AS rows_updated,\n       pst.sum_timer_update AS update_latency,\n       pst.count_delete AS rows_deleted,\n       pst.sum_timer_delete AS delete_latency,\n       fsbi.count_read AS io_read_requests,\n       fsbi.sum_number_of_bytes_read AS io_read,\n       fsbi.sum_timer_read AS io_read_latency,\n       fsbi.count_write AS io_write_requests,\n       fsbi.sum_number_of_bytes_write AS io_write,\n       fsbi.sum_timer_write AS io_write_latency,\n       fsbi.count_misc AS io_misc_requests,\n       fsbi.sum_timer_misc AS io_misc_latency,\n       ibp.allocated AS innodb_buffer_allocated,\n       ibp.data AS innodb_buffer_data,\n       (ibp.allocated - ibp.data) AS innodb_buffer_free,\n       ibp.pages AS innodb_buffer_pages,\n       ibp.pages_hashed AS innodb_buffer_pages_hashed,\n       ibp.pages_old AS innodb_buffer_pages_old,\n       ibp.rows_cached AS innodb_buffer_rows_cached\n  FROM performance_schema.table_io_waits_summary_by_table AS pst\n  LEFT JOIN x$ps_schema_table_statistics_io AS fsbi\n    ON pst.object_schema = fsbi.table_schema\n   AND pst.object_name = fsbi.table_name\n  LEFT JOIN sys.x$innodb_buffer_stats_by_table AS ibp\n    ON pst.object_schema = ibp.object_schema\n   AND pst.object_name = ibp.object_name\n ORDER BY pst.sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `pst`.`OBJECT_SCHEMA` AS `table_schema`,`pst`.`OBJECT_NAME` AS `table_name`,`pst`.`COUNT_FETCH` AS `rows_fetched`,`pst`.`SUM_TIMER_FETCH` AS `fetch_latency`,`pst`.`COUNT_INSERT` AS `rows_inserted`,`pst`.`SUM_TIMER_INSERT` AS `insert_latency`,`pst`.`COUNT_UPDATE` AS `rows_updated`,`pst`.`SUM_TIMER_UPDATE` AS `update_latency`,`pst`.`COUNT_DELETE` AS `rows_deleted`,`pst`.`SUM_TIMER_DELETE` AS `delete_latency`,`fsbi`.`count_read` AS `io_read_requests`,`fsbi`.`sum_number_of_bytes_read` AS `io_read`,`fsbi`.`sum_timer_read` AS `io_read_latency`,`fsbi`.`count_write` AS `io_write_requests`,`fsbi`.`sum_number_of_bytes_write` AS `io_write`,`fsbi`.`sum_timer_write` AS `io_write_latency`,`fsbi`.`count_misc` AS `io_misc_requests`,`fsbi`.`sum_timer_misc` AS `io_misc_latency`,`ibp`.`allocated` AS `innodb_buffer_allocated`,`ibp`.`data` AS `innodb_buffer_data`,`ibp`.`allocated` - `ibp`.`data` AS `innodb_buffer_free`,`ibp`.`pages` AS `innodb_buffer_pages`,`ibp`.`pages_hashed` AS `innodb_buffer_pages_hashed`,`ibp`.`pages_old` AS `innodb_buffer_pages_old`,`ibp`.`rows_cached` AS `innodb_buffer_rows_cached` from ((`performance_schema`.`table_io_waits_summary_by_table` `pst` left join `sys`.`x$ps_schema_table_statistics_io` `fsbi` on(`pst`.`OBJECT_SCHEMA` = `fsbi`.`table_schema` and `pst`.`OBJECT_NAME` = `fsbi`.`table_name`)) left join `sys`.`x$innodb_buffer_stats_by_table` `ibp` on(`pst`.`OBJECT_SCHEMA` = `ibp`.`object_schema` and `pst`.`OBJECT_NAME` = `ibp`.`object_name`)) order by `pst`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024schema_tables_with_full_table_scans.frm b/mariadb/sys/x@0024schema_tables_with_full_table_scans.frm
new file mode 100644
index 000000000..27f91ef98
--- /dev/null
+++ b/mariadb/sys/x@0024schema_tables_with_full_table_scans.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `object_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `object_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` AS `rows_full_scanned`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_WAIT` AS `latency` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is null and `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` > 0 order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` desc
+md5=2a4a59ec97eaf3d4a3b09f58b253c058
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648257508
+create-version=2
+source=SELECT object_schema,\n       object_name,\n       count_read AS rows_full_scanned,\n       sum_timer_wait AS latency\n  FROM performance_schema.table_io_waits_summary_by_index_usage\n WHERE index_name IS NULL\n   AND count_read > 0\n ORDER BY count_read DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_SCHEMA` AS `object_schema`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`OBJECT_NAME` AS `object_name`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` AS `rows_full_scanned`,`performance_schema`.`table_io_waits_summary_by_index_usage`.`SUM_TIMER_WAIT` AS `latency` from `performance_schema`.`table_io_waits_summary_by_index_usage` where `performance_schema`.`table_io_waits_summary_by_index_usage`.`INDEX_NAME` is null and `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` > 0 order by `performance_schema`.`table_io_waits_summary_by_index_usage`.`COUNT_READ` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024session.frm b/mariadb/sys/x@0024session.frm
new file mode 100644
index 000000000..9b1ebcd2a
--- /dev/null
+++ b/mariadb/sys/x@0024session.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `x$processlist`.`thd_id` AS `thd_id`,`x$processlist`.`conn_id` AS `conn_id`,`x$processlist`.`user` AS `user`,`x$processlist`.`db` AS `db`,`x$processlist`.`command` AS `command`,`x$processlist`.`state` AS `state`,`x$processlist`.`time` AS `time`,`x$processlist`.`current_statement` AS `current_statement`,`x$processlist`.`statement_latency` AS `statement_latency`,`x$processlist`.`progress` AS `progress`,`x$processlist`.`lock_latency` AS `lock_latency`,`x$processlist`.`rows_examined` AS `rows_examined`,`x$processlist`.`rows_sent` AS `rows_sent`,`x$processlist`.`rows_affected` AS `rows_affected`,`x$processlist`.`tmp_tables` AS `tmp_tables`,`x$processlist`.`tmp_disk_tables` AS `tmp_disk_tables`,`x$processlist`.`full_scan` AS `full_scan`,`x$processlist`.`last_statement` AS `last_statement`,`x$processlist`.`last_statement_latency` AS `last_statement_latency`,`x$processlist`.`current_memory` AS `current_memory`,`x$processlist`.`last_wait` AS `last_wait`,`x$processlist`.`last_wait_latency` AS `last_wait_latency`,`x$processlist`.`source` AS `source`,`x$processlist`.`trx_latency` AS `trx_latency`,`x$processlist`.`trx_state` AS `trx_state`,`x$processlist`.`trx_autocommit` AS `trx_autocommit`,`x$processlist`.`pid` AS `pid`,`x$processlist`.`program_name` AS `program_name` from `sys`.`x$processlist` where `x$processlist`.`conn_id` is not null and `x$processlist`.`command` <> \'Daemon\'
+md5=20277a58098b6112ed36c5879dbb6c33
+updatable=0
+algorithm=0
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153653066014
+create-version=2
+source=SELECT * FROM sys.x$processlist\nWHERE conn_id IS NOT NULL AND command != \'Daemon\';
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `x$processlist`.`thd_id` AS `thd_id`,`x$processlist`.`conn_id` AS `conn_id`,`x$processlist`.`user` AS `user`,`x$processlist`.`db` AS `db`,`x$processlist`.`command` AS `command`,`x$processlist`.`state` AS `state`,`x$processlist`.`time` AS `time`,`x$processlist`.`current_statement` AS `current_statement`,`x$processlist`.`statement_latency` AS `statement_latency`,`x$processlist`.`progress` AS `progress`,`x$processlist`.`lock_latency` AS `lock_latency`,`x$processlist`.`rows_examined` AS `rows_examined`,`x$processlist`.`rows_sent` AS `rows_sent`,`x$processlist`.`rows_affected` AS `rows_affected`,`x$processlist`.`tmp_tables` AS `tmp_tables`,`x$processlist`.`tmp_disk_tables` AS `tmp_disk_tables`,`x$processlist`.`full_scan` AS `full_scan`,`x$processlist`.`last_statement` AS `last_statement`,`x$processlist`.`last_statement_latency` AS `last_statement_latency`,`x$processlist`.`current_memory` AS `current_memory`,`x$processlist`.`last_wait` AS `last_wait`,`x$processlist`.`last_wait_latency` AS `last_wait_latency`,`x$processlist`.`source` AS `source`,`x$processlist`.`trx_latency` AS `trx_latency`,`x$processlist`.`trx_state` AS `trx_state`,`x$processlist`.`trx_autocommit` AS `trx_autocommit`,`x$processlist`.`pid` AS `pid`,`x$processlist`.`program_name` AS `program_name` from `sys`.`x$processlist` where `x$processlist`.`conn_id` is not null and `x$processlist`.`command` <> \'Daemon\'
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024statement_analysis.frm b/mariadb/sys/x@0024statement_analysis.frm
new file mode 100644
index 000000000..656409126
--- /dev/null
+++ b/mariadb/sys/x@0024statement_analysis.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,if(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` > 0,\'*\',\'\') AS `full_scan`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` AS `err_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` AS `warn_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`events_statements_summary_by_digest`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_LOCK_TIME` AS `lock_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` AS `rows_sent`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_sent_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_examined_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_AFFECTED` AS `rows_affected`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_AFFECTED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_affected_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` AS `tmp_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` AS `tmp_disk_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` AS `rows_sorted`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` AS `sort_merge_passes`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen` from `performance_schema`.`events_statements_summary_by_digest` order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+md5=c4d19fab63f1a07088959a488e8921e5
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648665958
+create-version=2
+source=SELECT DIGEST_TEXT AS query,\n       SCHEMA_NAME AS db,\n       IF(SUM_NO_GOOD_INDEX_USED > 0 OR SUM_NO_INDEX_USED > 0, \'*\', \'\') AS full_scan,\n       COUNT_STAR AS exec_count,\n       SUM_ERRORS AS err_count,\n       SUM_WARNINGS AS warn_count,\n       SUM_TIMER_WAIT AS total_latency,\n       MAX_TIMER_WAIT AS max_latency,\n       AVG_TIMER_WAIT AS avg_latency,\n       SUM_LOCK_TIME AS lock_latency,\n       SUM_ROWS_SENT AS rows_sent,\n       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,\n       SUM_ROWS_EXAMINED AS rows_examined,\n       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0))  AS rows_examined_avg,\n       SUM_ROWS_AFFECTED AS rows_affected,\n       ROUND(IFNULL(SUM_ROWS_AFFECTED / NULLIF(COUNT_STAR, 0), 0))  AS rows_affected_avg,\n       SUM_CREATED_TMP_TABLES AS tmp_tables,\n       SUM_CREATED_TMP_DISK_TABLES AS tmp_disk_tables,\n       SUM_SORT_ROWS AS rows_sorted,\n       SUM_SORT_MERGE_PASSES AS sort_merge_passes,\n       DIGEST AS digest,\n       FIRST_SEEN AS first_seen,\n       LAST_SEEN as last_seen\n  FROM performance_schema.events_statements_summary_by_digest\nORDER BY SUM_TIMER_WAIT DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,if(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` > 0,\'*\',\'\') AS `full_scan`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` AS `err_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` AS `warn_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`events_statements_summary_by_digest`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_LOCK_TIME` AS `lock_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` AS `rows_sent`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_sent_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_examined_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_AFFECTED` AS `rows_affected`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_AFFECTED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `rows_affected_avg`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` AS `tmp_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` AS `tmp_disk_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` AS `rows_sorted`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` AS `sort_merge_passes`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen` from `performance_schema`.`events_statements_summary_by_digest` order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024statements_with_errors_or_warnings.frm b/mariadb/sys/x@0024statements_with_errors_or_warnings.frm
new file mode 100644
index 000000000..e242de03d
--- /dev/null
+++ b/mariadb/sys/x@0024statements_with_errors_or_warnings.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` AS `errors`,ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100 AS `error_pct`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` AS `warnings`,ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100 AS `warning_pct`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` desc
+md5=490874cb895cee05cc7f8d813cd41ae8
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648824192
+create-version=2
+source=SELECT DIGEST_TEXT AS query,\n       SCHEMA_NAME as db,\n       COUNT_STAR AS exec_count,\n       SUM_ERRORS AS errors,\n       IFNULL(SUM_ERRORS / NULLIF(COUNT_STAR, 0), 0) * 100 as error_pct,\n       SUM_WARNINGS AS warnings,\n       IFNULL(SUM_WARNINGS / NULLIF(COUNT_STAR, 0), 0) * 100 as warning_pct,\n       FIRST_SEEN as first_seen,\n       LAST_SEEN as last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest\n WHERE SUM_ERRORS > 0\n    OR SUM_WARNINGS > 0\nORDER BY SUM_ERRORS DESC, SUM_WARNINGS DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` AS `errors`,ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100 AS `error_pct`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` AS `warnings`,ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100 AS `warning_pct`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_ERRORS` desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_WARNINGS` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024statements_with_full_table_scans.frm b/mariadb/sys/x@0024statements_with_full_table_scans.frm
new file mode 100644
index 000000000..1a93cadfd
--- /dev/null
+++ b/mariadb/sys/x@0024statements_with_full_table_scans.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` AS `no_index_used_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` AS `no_good_index_used_count`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100,0) AS `no_index_used_pct`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` / `performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0) AS `rows_sent_avg`,round(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` / `performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0) AS `rows_examined_avg`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where (`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` > 0) and `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`  not like \'SHOW%\' order by round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100,0) desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+md5=25b42c369cee614420db6a77c1fc10c6
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153648974207
+create-version=2
+source=SELECT DIGEST_TEXT AS query,\n       SCHEMA_NAME as db,\n       COUNT_STAR AS exec_count,\n       SUM_TIMER_WAIT AS total_latency,\n       SUM_NO_INDEX_USED AS no_index_used_count,\n       SUM_NO_GOOD_INDEX_USED AS no_good_index_used_count,\n       ROUND(IFNULL(SUM_NO_INDEX_USED / NULLIF(COUNT_STAR, 0), 0) * 100) AS no_index_used_pct,\n       SUM_ROWS_SENT AS rows_sent,\n       SUM_ROWS_EXAMINED AS rows_examined,\n       ROUND(SUM_ROWS_SENT/COUNT_STAR) AS rows_sent_avg,\n       ROUND(SUM_ROWS_EXAMINED/COUNT_STAR) AS rows_examined_avg,\n       FIRST_SEEN as first_seen,\n       LAST_SEEN as last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest\n WHERE (SUM_NO_INDEX_USED > 0\n    OR SUM_NO_GOOD_INDEX_USED > 0)\n   AND DIGEST_TEXT NOT LIKE \'SHOW%\'\n ORDER BY no_index_used_pct DESC, total_latency DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` AS `no_index_used_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` AS `no_good_index_used_count`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100,0) AS `no_index_used_pct`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_SENT` / `performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0) AS `rows_sent_avg`,round(`performance_schema`.`events_statements_summary_by_digest`.`SUM_ROWS_EXAMINED` / `performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0) AS `rows_examined_avg`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where (`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` > 0 or `performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_GOOD_INDEX_USED` > 0) and `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT`  not like \'SHOW%\' order by round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_NO_INDEX_USED` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0) * 100,0) desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024statements_with_runtimes_in_95th_percentile.frm b/mariadb/sys/x@0024statements_with_runtimes_in_95th_percentile.frm
new file mode 100644
index 000000000..5819b5b9f
--- /dev/null
+++ b/mariadb/sys/x@0024statements_with_runtimes_in_95th_percentile.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `stmts`.`DIGEST_TEXT` AS `query`,`stmts`.`SCHEMA_NAME` AS `db`,if(`stmts`.`SUM_NO_GOOD_INDEX_USED` > 0 or `stmts`.`SUM_NO_INDEX_USED` > 0,\'*\',\'\') AS `full_scan`,`stmts`.`COUNT_STAR` AS `exec_count`,`stmts`.`SUM_ERRORS` AS `err_count`,`stmts`.`SUM_WARNINGS` AS `warn_count`,`stmts`.`SUM_TIMER_WAIT` AS `total_latency`,`stmts`.`MAX_TIMER_WAIT` AS `max_latency`,`stmts`.`AVG_TIMER_WAIT` AS `avg_latency`,`stmts`.`SUM_ROWS_SENT` AS `rows_sent`,round(ifnull(`stmts`.`SUM_ROWS_SENT` / nullif(`stmts`.`COUNT_STAR`,0),0),0) AS `rows_sent_avg`,`stmts`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(ifnull(`stmts`.`SUM_ROWS_EXAMINED` / nullif(`stmts`.`COUNT_STAR`,0),0),0) AS `rows_examined_avg`,`stmts`.`FIRST_SEEN` AS `first_seen`,`stmts`.`LAST_SEEN` AS `last_seen`,`stmts`.`DIGEST` AS `digest` from (`performance_schema`.`events_statements_summary_by_digest` `stmts` join `sys`.`x$ps_digest_95th_percentile_by_avg_us` `top_percentile` on(round(`stmts`.`AVG_TIMER_WAIT` / 1000000,0) >= `top_percentile`.`avg_us`)) order by `stmts`.`AVG_TIMER_WAIT` desc
+md5=8cd6ce405be77ab4980ea412c943b553
+updatable=0
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649432607
+create-version=2
+source=SELECT DIGEST_TEXT AS query,\n       SCHEMA_NAME AS db,\n       IF(SUM_NO_GOOD_INDEX_USED > 0 OR SUM_NO_INDEX_USED > 0, \'*\', \'\') AS full_scan,\n       COUNT_STAR AS exec_count,\n       SUM_ERRORS AS err_count,\n       SUM_WARNINGS AS warn_count,\n       SUM_TIMER_WAIT AS total_latency,\n       MAX_TIMER_WAIT AS max_latency,\n       AVG_TIMER_WAIT AS avg_latency,\n       SUM_ROWS_SENT AS rows_sent,\n       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,\n       SUM_ROWS_EXAMINED AS rows_examined,\n       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0)) AS rows_examined_avg,\n       FIRST_SEEN as first_seen,\n       LAST_SEEN as last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest stmts\n  JOIN sys.x$ps_digest_95th_percentile_by_avg_us AS top_percentile\n    ON ROUND(stmts.avg_timer_wait/1000000) >= top_percentile.avg_us\n ORDER BY AVG_TIMER_WAIT DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `stmts`.`DIGEST_TEXT` AS `query`,`stmts`.`SCHEMA_NAME` AS `db`,if(`stmts`.`SUM_NO_GOOD_INDEX_USED` > 0 or `stmts`.`SUM_NO_INDEX_USED` > 0,\'*\',\'\') AS `full_scan`,`stmts`.`COUNT_STAR` AS `exec_count`,`stmts`.`SUM_ERRORS` AS `err_count`,`stmts`.`SUM_WARNINGS` AS `warn_count`,`stmts`.`SUM_TIMER_WAIT` AS `total_latency`,`stmts`.`MAX_TIMER_WAIT` AS `max_latency`,`stmts`.`AVG_TIMER_WAIT` AS `avg_latency`,`stmts`.`SUM_ROWS_SENT` AS `rows_sent`,round(ifnull(`stmts`.`SUM_ROWS_SENT` / nullif(`stmts`.`COUNT_STAR`,0),0),0) AS `rows_sent_avg`,`stmts`.`SUM_ROWS_EXAMINED` AS `rows_examined`,round(ifnull(`stmts`.`SUM_ROWS_EXAMINED` / nullif(`stmts`.`COUNT_STAR`,0),0),0) AS `rows_examined_avg`,`stmts`.`FIRST_SEEN` AS `first_seen`,`stmts`.`LAST_SEEN` AS `last_seen`,`stmts`.`DIGEST` AS `digest` from (`performance_schema`.`events_statements_summary_by_digest` `stmts` join `sys`.`x$ps_digest_95th_percentile_by_avg_us` `top_percentile` on(round(`stmts`.`AVG_TIMER_WAIT` / 1000000,0) >= `top_percentile`.`avg_us`)) order by `stmts`.`AVG_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024statements_with_sorting.frm b/mariadb/sys/x@0024statements_with_sorting.frm
new file mode 100644
index 000000000..d26cc111c
--- /dev/null
+++ b/mariadb/sys/x@0024statements_with_sorting.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` AS `sort_merge_passes`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_sort_merges`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_SCAN` AS `sorts_using_scans`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_RANGE` AS `sort_using_range`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` AS `rows_sorted`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_rows_sorted`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+md5=8b01a28d1860db00b058ebea2c26a640
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649599386
+create-version=2
+source=SELECT DIGEST_TEXT AS query,\n       SCHEMA_NAME db,\n       COUNT_STAR AS exec_count,\n       SUM_TIMER_WAIT AS total_latency,\n       SUM_SORT_MERGE_PASSES AS sort_merge_passes,\n       ROUND(IFNULL(SUM_SORT_MERGE_PASSES / NULLIF(COUNT_STAR, 0), 0)) AS avg_sort_merges,\n       SUM_SORT_SCAN AS sorts_using_scans,\n       SUM_SORT_RANGE AS sort_using_range,\n       SUM_SORT_ROWS AS rows_sorted,\n       ROUND(IFNULL(SUM_SORT_ROWS / NULLIF(COUNT_STAR, 0), 0)) AS avg_rows_sorted,\n       FIRST_SEEN as first_seen,\n       LAST_SEEN as last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest\n WHERE SUM_SORT_ROWS > 0\n ORDER BY SUM_TIMER_WAIT DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` AS `sort_merge_passes`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_MERGE_PASSES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_sort_merges`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_SCAN` AS `sorts_using_scans`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_RANGE` AS `sort_using_range`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` AS `rows_sorted`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_rows_sorted`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_SORT_ROWS` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024statements_with_temp_tables.frm b/mariadb/sys/x@0024statements_with_temp_tables.frm
new file mode 100644
index 000000000..ce31ba68d
--- /dev/null
+++ b/mariadb/sys/x@0024statements_with_temp_tables.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` AS `memory_tmp_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` AS `disk_tmp_tables`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_tmp_tables_per_query`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES`,0),0) * 100,0) AS `tmp_tables_to_disk_pct`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` desc
+md5=f5cd01b57e735775d233ed9f8cb24232
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649740846
+create-version=2
+source=SELECT DIGEST_TEXT AS query,\n       SCHEMA_NAME as db,\n       COUNT_STAR AS exec_count,\n       SUM_TIMER_WAIT as total_latency,\n       SUM_CREATED_TMP_TABLES AS memory_tmp_tables,\n       SUM_CREATED_TMP_DISK_TABLES AS disk_tmp_tables,\n       ROUND(IFNULL(SUM_CREATED_TMP_TABLES / NULLIF(COUNT_STAR, 0), 0)) AS avg_tmp_tables_per_query,\n       ROUND(IFNULL(SUM_CREATED_TMP_DISK_TABLES / NULLIF(SUM_CREATED_TMP_TABLES, 0), 0) * 100) AS tmp_tables_to_disk_pct,\n       FIRST_SEEN as first_seen,\n       LAST_SEEN as last_seen,\n       DIGEST AS digest\n  FROM performance_schema.events_statements_summary_by_digest\n WHERE SUM_CREATED_TMP_TABLES > 0\nORDER BY SUM_CREATED_TMP_DISK_TABLES DESC, SUM_CREATED_TMP_TABLES DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`events_statements_summary_by_digest`.`DIGEST_TEXT` AS `query`,`performance_schema`.`events_statements_summary_by_digest`.`SCHEMA_NAME` AS `db`,`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR` AS `exec_count`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` AS `memory_tmp_tables`,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` AS `disk_tmp_tables`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`COUNT_STAR`,0),0),0) AS `avg_tmp_tables_per_query`,round(ifnull(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` / nullif(`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES`,0),0) * 100,0) AS `tmp_tables_to_disk_pct`,`performance_schema`.`events_statements_summary_by_digest`.`FIRST_SEEN` AS `first_seen`,`performance_schema`.`events_statements_summary_by_digest`.`LAST_SEEN` AS `last_seen`,`performance_schema`.`events_statements_summary_by_digest`.`DIGEST` AS `digest` from `performance_schema`.`events_statements_summary_by_digest` where `performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` > 0 order by `performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_DISK_TABLES` desc,`performance_schema`.`events_statements_summary_by_digest`.`SUM_CREATED_TMP_TABLES` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024user_summary.frm b/mariadb/sys/x@0024user_summary.frm
new file mode 100644
index 000000000..03af53c02
--- /dev/null
+++ b/mariadb/sys/x@0024user_summary.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) AS `user`,sum(`stmt`.`total`) AS `statements`,sum(`stmt`.`total_latency`) AS `statement_latency`,ifnull(sum(`stmt`.`total_latency`) / nullif(sum(`stmt`.`total`),0),0) AS `statement_avg_latency`,sum(`stmt`.`full_scans`) AS `table_scans`,sum(`io`.`ios`) AS `file_ios`,sum(`io`.`io_latency`) AS `file_io_latency`,sum(`performance_schema`.`accounts`.`CURRENT_CONNECTIONS`) AS `current_connections`,sum(`performance_schema`.`accounts`.`TOTAL_CONNECTIONS`) AS `total_connections`,count(distinct `performance_schema`.`accounts`.`HOST`) AS `unique_hosts`,sum(`mem`.`current_allocated`) AS `current_memory`,sum(`mem`.`total_allocated`) AS `total_memory_allocated` from (((`performance_schema`.`accounts` left join `sys`.`x$user_summary_by_statement_latency` `stmt` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `stmt`.`user`)) left join `sys`.`x$user_summary_by_file_io` `io` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `io`.`user`)) left join `sys`.`x$memory_by_user_by_current_bytes` `mem` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `mem`.`user`)) group by if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) order by sum(`stmt`.`total_latency`) desc
+md5=82e3b4c9bcfc7fb791db32600a9deaed
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153650707433
+create-version=2
+source=SELECT IF(accounts.user IS NULL, \'background\', accounts.user) AS user,\n       SUM(stmt.total) AS statements,\n       SUM(stmt.total_latency) AS statement_latency,\n       IFNULL(SUM(stmt.total_latency) / NULLIF(SUM(stmt.total), 0), 0) AS statement_avg_latency,\n       SUM(stmt.full_scans) AS table_scans,\n       SUM(io.ios) AS file_ios,\n       SUM(io.io_latency) AS file_io_latency,\n       SUM(accounts.current_connections) AS current_connections,\n       SUM(accounts.total_connections) AS total_connections,\n       COUNT(DISTINCT host) AS unique_hosts,\n       SUM(mem.current_allocated) AS current_memory,\n       SUM(mem.total_allocated) AS total_memory_allocated\n  FROM performance_schema.accounts\n  LEFT JOIN sys.x$user_summary_by_statement_latency AS stmt ON IF(accounts.user IS NULL, \'background\', accounts.user) = stmt.user\n  LEFT JOIN sys.x$user_summary_by_file_io AS io ON IF(accounts.user IS NULL, \'background\', accounts.user) = io.user\n  LEFT JOIN sys.x$memory_by_user_by_current_bytes mem ON IF(accounts.user IS NULL, \'background\', accounts.user) = mem.user\n GROUP BY IF(accounts.user IS NULL, \'background\', accounts.user)\n ORDER BY SUM(stmt.total_latency) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) AS `user`,sum(`stmt`.`total`) AS `statements`,sum(`stmt`.`total_latency`) AS `statement_latency`,ifnull(sum(`stmt`.`total_latency`) / nullif(sum(`stmt`.`total`),0),0) AS `statement_avg_latency`,sum(`stmt`.`full_scans`) AS `table_scans`,sum(`io`.`ios`) AS `file_ios`,sum(`io`.`io_latency`) AS `file_io_latency`,sum(`performance_schema`.`accounts`.`CURRENT_CONNECTIONS`) AS `current_connections`,sum(`performance_schema`.`accounts`.`TOTAL_CONNECTIONS`) AS `total_connections`,count(distinct `performance_schema`.`accounts`.`HOST`) AS `unique_hosts`,sum(`mem`.`current_allocated`) AS `current_memory`,sum(`mem`.`total_allocated`) AS `total_memory_allocated` from (((`performance_schema`.`accounts` left join `sys`.`x$user_summary_by_statement_latency` `stmt` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `stmt`.`user`)) left join `sys`.`x$user_summary_by_file_io` `io` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `io`.`user`)) left join `sys`.`x$memory_by_user_by_current_bytes` `mem` on(if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) = `mem`.`user`)) group by if(`performance_schema`.`accounts`.`USER` is null,\'background\',`performance_schema`.`accounts`.`USER`) order by sum(`stmt`.`total_latency`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024user_summary_by_file_io.frm b/mariadb/sys/x@0024user_summary_by_file_io.frm
new file mode 100644
index 000000000..280b9e81d
--- /dev/null
+++ b/mariadb/sys/x@0024user_summary_by_file_io.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR`) AS `ios`,sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `io_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' group by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=6df37c787ef9fce933608c125a1387fb
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153650016039
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       SUM(count_star) AS ios,\n       SUM(sum_timer_wait) AS io_latency\n  FROM performance_schema.events_waits_summary_by_user_by_event_name\n WHERE event_name LIKE \'wait/io/file/%\'\n GROUP BY IF(user IS NULL, \'background\', user)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR`) AS `ios`,sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `io_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` like \'wait/io/file/%\' group by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024user_summary_by_file_io_type.frm b/mariadb/sys/x@0024user_summary_by_file_io_type.frm
new file mode 100644
index 000000000..72ba3be02
--- /dev/null
+++ b/mariadb/sys/x@0024user_summary_by_file_io_type.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` AS `latency`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` like \'wait/io/file%\' and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` > 0 order by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=090cb2483f78e6606559dbe59df50262
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153649882480
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       event_name,\n       count_star AS total,\n       sum_timer_wait AS latency,\n       max_timer_wait AS max_latency\n  FROM performance_schema.events_waits_summary_by_user_by_event_name\n WHERE event_name LIKE \'wait/io/file%\'\n   AND count_star > 0\n ORDER BY user, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` AS `latency`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` like \'wait/io/file%\' and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` > 0 order by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024user_summary_by_stages.frm b/mariadb/sys/x@0024user_summary_by_stages.frm
new file mode 100644
index 000000000..ecff5c8e5
--- /dev/null
+++ b/mariadb/sys/x@0024user_summary_by_stages.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency` from `performance_schema`.`events_stages_summary_by_user_by_event_name` where `performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=fd4b252d26f75f39a2cc024c0274015f
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153650566001
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       event_name,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       avg_timer_wait AS avg_latency\n  FROM performance_schema.events_stages_summary_by_user_by_event_name\n WHERE sum_timer_wait != 0\n ORDER BY user, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`EVENT_NAME` AS `event_name`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_stages_summary_by_user_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency` from `performance_schema`.`events_stages_summary_by_user_by_event_name` where `performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_stages_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_stages_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024user_summary_by_statement_latency.frm b/mariadb/sys/x@0024user_summary_by_statement_latency.frm
new file mode 100644
index 000000000..17a40d718
--- /dev/null
+++ b/mariadb/sys/x@0024user_summary_by_statement_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_LOCK_TIME`) AS `lock_latency`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_SENT`) AS `rows_sent`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_EXAMINED`) AS `rows_examined`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_AFFECTED`) AS `rows_affected`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_INDEX_USED`) + sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_GOOD_INDEX_USED`) AS `full_scans` from `performance_schema`.`events_statements_summary_by_user_by_event_name` group by if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=8a66e66ddf15b2e1bac716c31092459e
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153650415953
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       SUM(count_star) AS total,\n       SUM(sum_timer_wait) AS total_latency,\n       SUM(max_timer_wait) AS max_latency,\n       SUM(sum_lock_time) AS lock_latency,\n       SUM(sum_rows_sent) AS rows_sent,\n       SUM(sum_rows_examined) AS rows_examined,\n       SUM(sum_rows_affected) AS rows_affected,\n       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans\n  FROM performance_schema.events_statements_summary_by_user_by_event_name\n GROUP BY IF(user IS NULL, \'background\', user)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) AS `user`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_LOCK_TIME`) AS `lock_latency`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_SENT`) AS `rows_sent`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_EXAMINED`) AS `rows_examined`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_AFFECTED`) AS `rows_affected`,sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_INDEX_USED`) + sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_GOOD_INDEX_USED`) AS `full_scans` from `performance_schema`.`events_statements_summary_by_user_by_event_name` group by if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) order by sum(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024user_summary_by_statement_type.frm b/mariadb/sys/x@0024user_summary_by_statement_type.frm
new file mode 100644
index 000000000..b5bfb30d4
--- /dev/null
+++ b/mariadb/sys/x@0024user_summary_by_statement_type.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) AS `user`,substring_index(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`EVENT_NAME`,\'/\',-1) AS `statement`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_LOCK_TIME` AS `lock_latency`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_EXAMINED` AS `rows_examined`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_AFFECTED` AS `rows_affected`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_INDEX_USED` + `performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_GOOD_INDEX_USED` AS `full_scans` from `performance_schema`.`events_statements_summary_by_user_by_event_name` where `performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=ccc4b90f7417d82d85b9dc522b56d654
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153650282566
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       SUBSTRING_INDEX(event_name, \'/\', -1) AS statement,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       max_timer_wait AS max_latency,\n       sum_lock_time AS lock_latency,\n       sum_rows_sent AS rows_sent,\n       sum_rows_examined AS rows_examined,\n       sum_rows_affected AS rows_affected,\n       sum_no_index_used + sum_no_good_index_used AS full_scans\n  FROM performance_schema.events_statements_summary_by_user_by_event_name\n WHERE sum_timer_wait != 0\n ORDER BY user, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`) AS `user`,substring_index(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`EVENT_NAME`,\'/\',-1) AS `statement`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_LOCK_TIME` AS `lock_latency`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_SENT` AS `rows_sent`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_EXAMINED` AS `rows_examined`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_ROWS_AFFECTED` AS `rows_affected`,`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_INDEX_USED` + `performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_NO_GOOD_INDEX_USED` AS `full_scans` from `performance_schema`.`events_statements_summary_by_user_by_event_name` where `performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` <> 0 order by if(`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_statements_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_statements_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024wait_classes_global_by_avg_latency.frm b/mariadb/sys/x@0024wait_classes_global_by_avg_latency.frm
new file mode 100644
index 000000000..3f695e94f
--- /dev/null
+++ b/mariadb/sys/x@0024wait_classes_global_by_avg_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) AS `event_class`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,min(`performance_schema`.`events_waits_summary_global_by_event_name`.`MIN_TIMER_WAIT`) AS `min_latency`,ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0) AS `avg_latency`,max(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 and `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' group by substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) order by ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0) desc
+md5=a2b68acb933f339797a5f792e65b55f3
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652065922
+create-version=2
+source=SELECT SUBSTRING_INDEX(event_name,\'/\', 3) AS event_class,\n       SUM(COUNT_STAR) AS total,\n       SUM(sum_timer_wait) AS total_latency,\n       MIN(min_timer_wait) AS min_latency,\n       IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0) AS avg_latency,\n       MAX(max_timer_wait) AS max_latency\n  FROM performance_schema.events_waits_summary_global_by_event_name\n WHERE sum_timer_wait > 0\n   AND event_name != \'idle\'\n GROUP BY event_class\n ORDER BY IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) AS `event_class`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,min(`performance_schema`.`events_waits_summary_global_by_event_name`.`MIN_TIMER_WAIT`) AS `min_latency`,ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0) AS `avg_latency`,max(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 and `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' group by substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) order by ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024wait_classes_global_by_latency.frm b/mariadb/sys/x@0024wait_classes_global_by_latency.frm
new file mode 100644
index 000000000..3e69a5fe5
--- /dev/null
+++ b/mariadb/sys/x@0024wait_classes_global_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) AS `event_class`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,min(`performance_schema`.`events_waits_summary_global_by_event_name`.`MIN_TIMER_WAIT`) AS `min_latency`,ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0) AS `avg_latency`,max(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 and `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' group by substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) order by sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) desc
+md5=b107bc5e0b1c409651fc3872b551fbd6
+updatable=0
+algorithm=2
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652216077
+create-version=2
+source=SELECT SUBSTRING_INDEX(event_name,\'/\', 3) AS event_class,\n       SUM(COUNT_STAR) AS total,\n       SUM(sum_timer_wait) AS total_latency,\n       MIN(min_timer_wait) AS min_latency,\n       IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0) AS avg_latency,\n       MAX(max_timer_wait) AS max_latency\n  FROM performance_schema.events_waits_summary_global_by_event_name\n WHERE sum_timer_wait > 0\n   AND event_name != \'idle\'\n GROUP BY SUBSTRING_INDEX(event_name,\'/\', 3)\n ORDER BY SUM(sum_timer_wait) DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) AS `event_class`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`) AS `total`,sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) AS `total_latency`,min(`performance_schema`.`events_waits_summary_global_by_event_name`.`MIN_TIMER_WAIT`) AS `min_latency`,ifnull(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) / nullif(sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR`),0),0) AS `avg_latency`,max(`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT`) AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 and `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' group by substring_index(`performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME`,\'/\',3) order by sum(`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT`) desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024waits_by_host_by_latency.frm b/mariadb/sys/x@0024waits_by_host_by_latency.frm
new file mode 100644
index 000000000..a06c3c013
--- /dev/null
+++ b/mariadb/sys/x@0024waits_by_host_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` AS `event`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` > 0 order by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=6db496ac0e3e32dd8e3ca80c584f8ccd
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652524368
+create-version=2
+source=SELECT IF(host IS NULL, \'background\', host) AS host,\n       event_name AS event,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       avg_timer_wait AS avg_latency,\n       max_timer_wait AS max_latency\n  FROM performance_schema.events_waits_summary_by_host_by_event_name\n WHERE event_name != \'idle\'\n   AND sum_timer_wait > 0\n ORDER BY host, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`) AS `host`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` AS `event`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`events_waits_summary_by_host_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_by_host_by_event_name` where `performance_schema`.`events_waits_summary_by_host_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` > 0 order by if(`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST` is null,\'background\',`performance_schema`.`events_waits_summary_by_host_by_event_name`.`HOST`),`performance_schema`.`events_waits_summary_by_host_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024waits_by_user_by_latency.frm b/mariadb/sys/x@0024waits_by_user_by_latency.frm
new file mode 100644
index 000000000..3fdd8ed75
--- /dev/null
+++ b/mariadb/sys/x@0024waits_by_user_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` AS `event`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is not null and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` > 0 order by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=c1f2d1207467817a5938ea4cd03c4e55
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652366017
+create-version=2
+source=SELECT IF(user IS NULL, \'background\', user) AS user,\n       event_name AS event,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       avg_timer_wait AS avg_latency,\n       max_timer_wait AS max_latency\n  FROM performance_schema.events_waits_summary_by_user_by_event_name\n WHERE event_name != \'idle\'\n   AND user IS NOT NULL\n   AND sum_timer_wait > 0\n ORDER BY user, sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`) AS `user`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` AS `event`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`events_waits_summary_by_user_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_by_user_by_event_name` where `performance_schema`.`events_waits_summary_by_user_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is not null and `performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` > 0 order by if(`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER` is null,\'background\',`performance_schema`.`events_waits_summary_by_user_by_event_name`.`USER`),`performance_schema`.`events_waits_summary_by_user_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/sys/x@0024waits_global_by_latency.frm b/mariadb/sys/x@0024waits_global_by_latency.frm
new file mode 100644
index 000000000..2138840d6
--- /dev/null
+++ b/mariadb/sys/x@0024waits_global_by_latency.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` AS `events`,`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_waits_summary_global_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 order by `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` desc
+md5=63c324ddff171469768e3ef704df8c1e
+updatable=1
+algorithm=1
+definer_user=mariadb.sys
+definer_host=localhost
+suid=0
+with_check_option=0
+timestamp=0001700153652674349
+create-version=2
+source=SELECT event_name AS event,\n       count_star AS total,\n       sum_timer_wait AS total_latency,\n       avg_timer_wait AS avg_latency,\n       max_timer_wait AS max_latency\n  FROM performance_schema.events_waits_summary_global_by_event_name\n WHERE event_name != \'idle\'\n   AND sum_timer_wait > 0\n ORDER BY sum_timer_wait DESC;
+client_cs_name=utf8mb3
+connection_cl_name=utf8mb3_general_ci
+view_body_utf8=select `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` AS `events`,`performance_schema`.`events_waits_summary_global_by_event_name`.`COUNT_STAR` AS `total`,`performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` AS `total_latency`,`performance_schema`.`events_waits_summary_global_by_event_name`.`AVG_TIMER_WAIT` AS `avg_latency`,`performance_schema`.`events_waits_summary_global_by_event_name`.`MAX_TIMER_WAIT` AS `max_latency` from `performance_schema`.`events_waits_summary_global_by_event_name` where `performance_schema`.`events_waits_summary_global_by_event_name`.`EVENT_NAME` <> \'idle\' and `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` > 0 order by `performance_schema`.`events_waits_summary_global_by_event_name`.`SUM_TIMER_WAIT` desc
+mariadb-version=110103
diff --git a/mariadb/undo001 b/mariadb/undo001
new file mode 100644
index 000000000..036e12a98
Binary files /dev/null and b/mariadb/undo001 differ
diff --git a/mariadb/undo002 b/mariadb/undo002
new file mode 100644
index 000000000..5c30ecb36
Binary files /dev/null and b/mariadb/undo002 differ
diff --git a/mariadb/undo003 b/mariadb/undo003
new file mode 100644
index 000000000..36610afcb
Binary files /dev/null and b/mariadb/undo003 differ