Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41 ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged sql/table.cc: Auto merged mysql-test/r/ps.result: Manual merge: use local. mysql-test/t/ps.test: Manual merge: remove duplicate test cases from ps.test. sql/sql_lex.cc: Manual merge. sql/sql_prepare.cc: Manual merge. sql/table.h: Manual merge.
Showing
This diff is collapsed.
Please register or sign in to comment