mariadb/ndb
unknown 8dc5c95b14 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
configure.in:
  Resolve conflicts
2005-09-12 17:00:50 -07:00
..
bin .del-mysqlclusterd~7ebaf8faea0a1100: 2004-06-16 16:59:33 +00:00
config added ndb_init.h to distribution 2004-12-21 10:37:12 +01:00
demos
docs Merge mysql.com:/home/jonas/src/mysql-5.0 2005-01-29 07:11:22 +01:00
home removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
include Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 2005-09-12 14:11:28 +02:00
lib
ndbapi-examples updated example makefiles to add libmystrings 2005-03-03 20:21:45 +01:00
src Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-09-12 17:00:50 -07:00
test Merge eel.(none):/home/jonas/src/mysql-4.1 2005-09-09 19:02:13 +02:00
tools Merge 2005-09-06 09:01:17 +02:00
Makefile.am moved sorting and duplicate check for unique indexes from api to kernel 2005-01-27 10:44:47 +01:00