Comment 1 for bug 846227

Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

Text conflict in VERSION
Text conflict in sql/sql_class.cc
Text conflict in storage/innobase/include/dict0mem.h
3 conflicts encountered.