Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/myisam.result: Use local. mysql-test/t/myisam.test: Use local.
Showing
Please register or sign in to comment