mariadb/extra
unknown 8f7696d266 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines


extra/perror.c:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/t/disabled.def:
  manual merge
2007-06-17 17:21:27 +02:00
..
yassl Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 2007-04-11 22:12:32 +02:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
charset2html.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
CMakeLists.txt Bug#24732 Executables do not include Vista manifests 2007-04-23 16:23:32 -04:00
comp_err.c Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-05-24 13:24:36 +03:00
innochecksum.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
Makefile.am Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum 2007-02-22 16:44:37 +01:00
my_print_defaults.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
mysql_waitpid.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
perror.c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 2007-06-17 17:21:27 +02:00
replace.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
resolve_stack_dump.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
resolveip.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00