mirror of
https://github.com/MariaDB/server.git
synced 2025-11-06 13:10:12 +03:00
mysql-test/mysql-test-run.sh: A post-merge fix (apply a change lost during the merge). sql/ha_ndbcluster.cc: A post-merge fix: resolve a merge error. sql/item.cc: Fix a merge error. sql/item_xmlfunc.cc: Use the new signature of agg_arg_charsets.
66 KiB
66 KiB