mariadb/storage/ndb/include
unknown e833ecae4b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/include/btr0cur.ic:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-10-10 11:25:24 +02:00
..
debugger ndb-wl2325.patch 2005-09-15 11:33:50 +02:00
editline Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
kernel Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 2006-10-04 11:42:50 +02:00
logger Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 23:27:06 +03:00
mgmapi Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 2006-10-05 23:13:29 +10:00
mgmcommon Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-09-15 11:43:49 +02:00
ndbapi ndb - bug#17929 2006-10-05 14:25:18 +02:00
newtonapi Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
portlib Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
transporter NDBAPI cleanup 2006-08-30 11:41:21 +02:00
util Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 2006-10-05 23:13:29 +10:00
Makefile.am Merge 2005-10-07 01:12:46 +02:00
ndb_constants.h NDB temporary tables. 2006-09-07 15:09:34 +02:00
ndb_global.h.in Merge shellback.(none):/home/msvensson/mysql/work/my50-work 2006-09-15 17:00:09 +02:00
ndb_init.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_net.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_types.h.in Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
ndb_version.h.in Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 2006-10-04 11:42:50 +02:00