mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
5f0c09dd72
Conflicts: - include/my_no_pthread.h - mysql-test/r/sp-ucs2.result - sql/log.cc - sql/sql_acl.cc - sql/sql_yacc.yy |
||
---|---|---|
.. | ||
charsets | ||
errmsg-cnv.sh | ||
errmsg-utf8.txt | ||
errmsg.txt | ||
Makefile.am |