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

..

ha_archive.cc

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

2005-09-12 17:00:50 -07:00

ha_archive.h

Fix for bad merge.

2005-08-30 11:04:23 -07:00

ha_example.cc

Merge mishka.local:/home/my/mysql-4.1

2005-08-25 06:55:48 +03:00

ha_example.h

A fix and a test case for Bug#10760 and complementary cleanups.

2005-07-19 22:21:12 +04:00

ha_tina.cc

Merge zim.(none):/home/brian/mysql/mysql-4.1

2005-09-07 10:43:22 -07:00

ha_tina.h

A fix and a test case for Bug#10760 and complementary cleanups.

2005-07-19 22:21:12 +04:00