mariadb/mysql-test/suite/ndb
unknown bfa3d409bd Merge chilla.local:/home/mydev/mysql-5.1-amain
into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_update.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
  Auto merged
mysql-test/suite/parts/r/rpl_partition.result:
  Auto merged
mysql-test/suite/parts/t/rpl_partition.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
2007-07-14 19:35:43 +02:00
..
r Merge chilla.local:/home/mydev/mysql-5.1-amain 2007-07-14 19:35:43 +02:00
t Merge chilla.local:/home/mydev/mysql-5.1-amain 2007-07-14 19:35:43 +02:00