unknown 69bfcd9c40 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 ... into neptunus.(none):/home/msvensson/mysql/mysql-5.0 client/mysql.cc: Auto merged client/mysqltest.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged mysys/my_init.c: Auto merged sql/sql_update.cc: Auto merged Makefile.am: Manual merge mysql-test/r/cast.result: Manual merge mysql-test/t/cast.test: Manual merge ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: Manual merge sql/ha_ndbcluster.cc: Manual merge sql/item.h: Manual merge sql/opt_sum.cc: Manual merge sql/sql_delete.cc: Manual merge sql/sql_lex.cc: Manual merge sql/sql_load.cc: Manual merge sql/sql_prepare.cc: Manual merge		2005-09-28 11:34:53 +02: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	Removed unnecessary README files	2004-04-14 15:42:56 +02:00
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	ndb - post merge fixes	2005-09-20 12:07:18 +02:00
lib
ndbapi-examples	updated example makefiles to add libmystrings	2005-03-03 20:21:45 +01:00
src	Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1	2005-09-28 11:34:53 +02:00
test	ndb	2005-09-16 14:18:27 +02:00
tools	Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1	2005-09-20 10:46:33 +02:00
Makefile.am	moved sorting and duplicate check for unique indexes from api to kernel	2005-01-27 10:44:47 +01:00