mariadb/storage/ndb
unknown 36aeee3682 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/ndbapi/Makefile.am:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
2005-09-09 15:26:47 +02:00
..
bin Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
config All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
demos Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
docs All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
home Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
include Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-09 15:26:47 +02:00
lib Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbapi-examples fixed makefiles in examples to adopt to change in file structure 2005-07-19 01:22:49 +02:00
src Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-09 15:26:47 +02:00
test Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-09 15:26:47 +02:00
tools Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-06 09:21:23 +02:00
Makefile.am All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00