mirror of
https://github.com/MariaDB/server.git
synced 2025-05-28 13:01:41 +03:00
into mysql.com:/home/my/mysql-5.1 sql/ha_ndbcluster.cc: Auto merged mysql-test/t/disabled.def: Manual merge
into mysql.com:/home/my/mysql-5.1 sql/ha_ndbcluster.cc: Auto merged mysql-test/t/disabled.def: Manual merge