• unknown's avatar
    Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 8dc5c95b
    unknown authored
    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
    8dc5c95b
my_pthread.h 24.1 KB