unknown bbfa47d099 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb ...

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

2006-11-30 15:48:28 +01:00

..

archive

Varchar hack to clean strings removed.

2006-11-28 18:30:41 -08:00

blackhole

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

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

csv

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

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:/data0/bk/mysql-5.1

2006-11-28 22:22:52 +01:00

heap

Removed compiler warnings

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

innobase

Removed compiler warnings

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

myisam

Removed compiler warnings

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

myisammrg

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

2006-11-28 22:22:52 +01:00

ndb

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb

2006-11-30 15:48:28 +01:00

Makefile.am

fixes for 'make dist' and 'make distcheck'

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