unknown 6630d2e18c Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl ... into mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl BitKeeper/deleted/.del-binlog_killed_simulate.result: Auto merged BitKeeper/deleted/.del-show_binlog_events.inc: Auto merged mysql-test/suite/rpl/r/rpl_user.result: Auto merged storage/blackhole/ha_blackhole.cc: Auto merged BitKeeper/deleted/.del-show_binary_logs.inc: Delete: mysql-test/include/show_binary_logs.inc mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: manual merge ul. mysql-test/extra/binlog_tests/blackhole.test: manual merge mysql-test/suite/binlog/r/binlog_stm_blackhole.result: manual merge sql/log.cc: manual merge sql/share/errmsg.txt: manual merge sql/sql_class.cc: manual merge		2008-03-29 15:00:12 +02:00
..
CMakeLists.txt	Bug#31929 Windows build fails with >=4 Parallel build threads.	2008-01-29 21:58:57 -05:00
ha_blackhole.cc	Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl	2008-03-29 15:00:12 +02:00
ha_blackhole.h	Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris	2007-08-13 16:11:25 +03:00
Makefile.am	Use pkglibdir to simplify pkgplugindir, and fix the path in a	2008-01-02 13:00:46 +00:00
plug.in	Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed.	2006-08-18 21:19:19 -07:00