Commit 74bbf416 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/opt/local/work/mysql-5.0-root


libmysql/libmysql.c:
  Manual merge: use local.
tests/mysql_client_test.c:
  Manual merge: use local.
parents 6bbc1cd4 4391f938

There are no changes