unknown 6988eaffad merge with 4.0.18 ... Build-tools/Bootstrap: Auto merged client/mysql.cc: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/t/auto_increment.test: Auto merged mysql-test/t/type_decimal.test: Auto merged sql/opt_range.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/slave.cc: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged		2003-12-19 16:42:17 +02:00
..
errmsg.txt	merge with 4.0.18	2003-12-19 16:42:17 +02:00