mariadb/storage/ndb
unknown dadde7fb86 Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
into  romeo.(none):/home/bk/merge-mysql-5.1


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
2007-04-20 10:46:58 +02:00
..
bin Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
config Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
demos Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
docs Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
include Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 2007-04-12 21:35:39 +02:00
lib Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbapi-examples A few minor cleanups for recent AbortOption behaviour change. 2007-02-20 09:52:18 +01:00
src Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 2007-04-20 10:46:58 +02:00
test Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 2007-04-12 16:00:51 +02:00
tools Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 2007-04-13 01:45:44 +02:00
Makefile.am Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01: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