diff options
| author | unknown <konstantin@mysql.com> | 2006-03-05 01:11:24 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-03-05 01:11:24 +0300 |
| commit | 74bbf4161f1e6af0fe293d40eb93962705f9b72d (patch) | |
| tree | de9685a507214933e3cb5e85621eca12283346ec | |
| parent | 6bbc1cd40e0c114b2d31512d45027969148b2e80 (diff) | |
| parent | 4391f938922a7f62831481c350ad4a680c64c827 (diff) | |
| download | mariadb-git-74bbf4161f1e6af0fe293d40eb93962705f9b72d.tar.gz | |
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.
0 files changed, 0 insertions, 0 deletions