Commit 04b938c9 authored by unknown's avatar unknown
Browse files

Merge 


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/share/Makefile.am:
  Auto merged
libmysql/libmysql.c:
  Merge from 4.0
parents 0de8a53f e584559f

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ dlenev@mysql.com 
ejonore@mc03.ndb.mysql.com

evgen@moonbone.(none)

evgen@moonbone.local

gbichot@production.mysql.com

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com

georg@beethoven.local