unknown 173e5df37f Merge mishka.local:/home/my/mysql-4.1 ... into mishka.local:/home/my/mysql-5.0 BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667: Auto merged BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387: Auto merged BitKeeper/deleted/.del-ctype_cp932.result: Auto merged BitKeeper/deleted/.del-ctype_cp932.test: Auto merged BitKeeper/deleted/.del-have_lowercase0.inc: Delete: mysql-test/include/have_lowercase0.inc VC++Files/mysql-test/mysql_test_run_new.dsp: Auto merged configure.in: Auto merged mysql-test/include/ps_conv.inc: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/ha_innodb.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/examples/ha_example.cc: Auto merged sql/sql_table.cc: Auto merged support-files/mysql.spec.sh: Auto merged VC++Files/client/mysqltest.dsp: manual merge VC++Files/sql/mysqld.dsp: manual merge mysql-test/r/grant2.result: patch merge mysql-test/r/subselect2.result: manual merge mysql-test/t/grant2.test: patch merge mysys/charset.c: Remove already deleted function sql/examples/ha_archive.h: Manual merge sql/sql_acl.cc: manual merge sql/sql_db.cc: merge (no differences) sql/sql_select.cc: manual merge sql/table.h: merge (no differences) tests/mysql_client_test.c: patch merge		2005-08-25 06:55:48 +03:00
..
include	ndb - hugo, fix closeTransaction in testPartitioning	2005-07-22 16:29:38 +02:00
ndbapi	Merge mishka.local:/home/my/mysql-4.1	2005-08-25 06:55:48 +03:00
ndbnet	Initial revision of NDB Cluster files	2004-04-14 10:53:21 +02:00
newtonapi	ndb source tree cleanup, see respective file	2004-06-07 17:31:32 +00:00
odbc	removed a bunch of "dead" files from the ndb src tree	2004-11-05 23:59:06 +00:00
run-test	Merge mysql.com:/home/jonas/src/mysql-4.1	2005-07-20 13:25:52 +02:00
src	ndb - hugo, fix closeTransaction in testPartitioning	2005-07-22 16:29:38 +02:00
tools	merge	2005-05-26 22:42:13 +02:00
Makefile.am	wl1744 - ndb on windows	2004-11-10 00:03:01 +01:00