mariadb/storage/ndb/include
unknown ea6aba52c1 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


configure.in:
  Auto merged
include/heap.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_update.cc:
  Manual merge
tests/mysql_client_test.c:
  SCCS merged
2006-02-08 23:53:45 +03: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 localhost:src/51-new 2006-02-02 20:18:50 +01:00
logger Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 23:27:06 +03:00
mgmapi Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 23:53:45 +03:00
mgmcommon Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 23:27:06 +03:00
ndbapi MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event 2006-02-07 10:03:03 +01: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 Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
util Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-01-13 09:22:02 +01:00
Makefile.am Merge 2005-10-07 01:12:46 +02:00
ndb_constants.h Import ndb varsize 2005-11-07 12:19:28 +01:00
ndb_global.h.in configure.in: 2005-11-08 07:41:46 +01: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 WL #2747: Fix such that backup and restore works for user defined 2006-01-17 09:25:12 +01:00