Commit 73d0afd3 authored by unknown's avatar unknown
Browse files

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl

into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl


BitKeeper/etc/ignore:
  auto-union
parents cdf8050b 0af91dd8
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -1322,7 +1322,6 @@ mysql-test/r/udf.log
mysql-test/share/mysql
mysql-test/std_data/*.pem
mysql-test/t/index_merge.load
mysql-test/t/rpl_truncate_4ndb.test
mysql-test/var
mysql-test/var/*
mysql.kdevprj