mariadb/libmysqld
unknown 67601f55cb Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M51/mysql-5.1


libmysqld/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
client/Makefile.am:
  Merge does not fit - to be done manually.
2007-05-02 14:08:43 +02:00
..
examples
CMakeLists.txt
copyright
emb_qcache.cc
emb_qcache.h
embedded_priv.h
lib_sql.cc
libmysqld.c
libmysqld.def
libmysqld.rc
Makefile.am
resource.h