Skip to content

Commit 32d0a5d

Browse files
committed
Merge branch 'mysql-5.6' into mysql-5.7
2 parents 19e46ed + 3842f22 commit 32d0a5d

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/usr/share/mysql/charsets/armscii8.xml
2+
/usr/share/mysql/charsets/ascii.xml
3+
/usr/share/mysql/charsets/cp1250.xml
4+
/usr/share/mysql/charsets/cp1251.xml
5+
/usr/share/mysql/charsets/cp1256.xml
6+
/usr/share/mysql/charsets/cp1257.xml
7+
/usr/share/mysql/charsets/cp850.xml
8+
/usr/share/mysql/charsets/cp852.xml
9+
/usr/share/mysql/charsets/cp866.xml
10+
/usr/share/mysql/charsets/dec8.xml
11+
/usr/share/mysql/charsets/geostd8.xml
12+
/usr/share/mysql/charsets/greek.xml
13+
/usr/share/mysql/charsets/hebrew.xml
14+
/usr/share/mysql/charsets/hp8.xml
15+
/usr/share/mysql/charsets/Index.xml
16+
/usr/share/mysql/charsets/keybcs2.xml
17+
/usr/share/mysql/charsets/koi8r.xml
18+
/usr/share/mysql/charsets/koi8u.xml
19+
/usr/share/mysql/charsets/latin1.xml
20+
/usr/share/mysql/charsets/latin2.xml
21+
/usr/share/mysql/charsets/latin5.xml
22+
/usr/share/mysql/charsets/latin7.xml
23+
/usr/share/mysql/charsets/macce.xml
24+
/usr/share/mysql/charsets/macroman.xml
25+
/usr/share/mysql/charsets/swe7.xml

0 commit comments

Comments
 (0)