-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged sql/item.cc: Auto merged sql/log.cc: Auto merged sql/sql_parse.cc: Auto merged
0d9ba267
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged sql/item.cc: Auto merged sql/log.cc: Auto merged sql/sql_parse.cc: Auto merged