unknown 99cee82126 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 ... into mysql.com:/home/dlenev/src/mysql-5.0-bg11394 mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged mysql-test/r/sp-error.result: Manual merge. mysql-test/t/sp-error.test: Manual merge. sql/share/errmsg.txt: Manual merge.		2005-07-06 10:21:27 +04:00
..
charsets	Merge mysql.com:/home/ram/work/mysql-4.1	2005-05-06 20:11:01 +05:00
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
errmsg.txt	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	2005-07-06 10:21:27 +04:00
Makefile.am	- manual merge	2005-04-21 08:30:59 +02:00