unknown 64f5ce7ec3 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint ...

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/util/socket_io.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/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Manual merge
storage/ndb/src/common/util/InputStream.cpp:
  Manual merge

2006-12-05 19:19:58 +01:00

..

archive

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2006-11-30 23:27:16 +02:00

blackhole

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge

2006-10-18 18:51:39 +10:00

csv

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2006-11-30 23:27:16 +02:00

example

Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location.

2006-11-19 18:01:54 -08:00

federated

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2006-11-30 23:27:16 +02:00

heap

Merge mysql.com:/home/my/mysql-5.0

2006-11-30 22:38:12 +02:00

innobase

Removed compiler warnings

2006-11-27 18:16:08 +02:00

myisam

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1

2006-12-04 19:11:55 +01:00

myisammrg

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2006-11-30 23:27:16 +02:00

ndb

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

2006-12-05 19:19:58 +01:00

Makefile.am

fixes for 'make dist' and 'make distcheck'

2006-04-12 14:08:24 +02:00