1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Auto merged
mysql-test/t/rpl_ndb_bank.test:
  Auto merged
mysql-test/t/rpl_ndb_basic.test:
  Auto merged
mysql-test/t/rpl_ndb_do_table.test:
  Auto merged
mysql-test/t/rpl_ndb_idempotent.test:
  Auto merged
mysql-test/t/rpl_ndb_stm_innodb.test:
  Auto merged
mysql-test/t/rpl_ndb_sync.test:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
mysql-test/include/have_multi_ndb.inc:
  manual merge
mysql-test/include/have_ndb.inc:
  manual merge
mysql-test/t/rpl_ndb_commit_afterflush.test:
  manual merge
mysql-test/t/rpl_ndb_ddl.test:
  manual merge
mysql-test/t/rpl_ndb_innodb_trans.test:
  manual merge
This commit is contained in:
unknown
2007-06-18 23:55:48 +02:00
86 changed files with 207 additions and 116 deletions

View File

@ -1,6 +1,3 @@
--source include/have_binlog_format_row.inc
--source include/master-slave.inc
#
# Basic tests of row-level logging
#