mariadb/storage/innobase
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
..
btr Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-04-26 19:07:13 -07:00
buf Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
data Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
db Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
dict Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-02 13:18:26 +02:00
dyn Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
eval Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
fil Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-02 13:18:26 +02:00
fsp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
fut Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ha Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ibuf Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
include Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
lock Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
log Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-04-26 19:07:13 -07:00
mach Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mem Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mtr Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
os Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-04-26 19:07:13 -07:00
page Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
pars Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
que Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
read Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
rem Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
row Merge 2005-05-31 14:37:47 +02:00
srv Merge 2005-05-31 14:37:47 +02:00
sync Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
thr Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
trx Merge 2005-05-31 14:37:47 +02:00
usr Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ut Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
configure.in Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Makefile.am Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
makefilewin Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
my_cnf Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00