-
unknown authored
into mysql.com:/home/ram/work/mysql-5.0 include/my_global.h: Auto merged BitKeeper/etc/logging_ok: auto-union sql/share/charsets/Index.xml: Auto merged
210777df
into mysql.com:/home/ram/work/mysql-5.0 include/my_global.h: Auto merged BitKeeper/etc/logging_ok: auto-union sql/share/charsets/Index.xml: Auto merged