mariadb/storage/ndb
unknown aba391dd34 Merge
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.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/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/sql_delete.cc:
  merge
sql/sql_update.cc:
  merge
sql/table.cc:
  SCCS merged
support-files/mysql.spec.sh:
  merge
2005-05-31 14:37: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-05-20 06:25:02 +02:00
lib Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbapi-examples Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
src Merge 2005-05-31 14:37:47 +02:00
test merge 2005-05-17 10:17:53 +02:00
tools All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
Makefile.am All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00