diff options
author | unknown <anozdrin/alik@quad.opbmk> | 2008-03-18 13:53:51 +0300 |
---|---|---|
committer | unknown <anozdrin/alik@quad.opbmk> | 2008-03-18 13:53:51 +0300 |
commit | 8df28e525bff27aa34fe08a57fabba578e12ffec (patch) | |
tree | ac3aa6164de2c626ea1a053059068240ca07a75e /include | |
parent | ecc147f2f6807722254593d711cd046af538ac43 (diff) | |
parent | 3973c140e885b394f73bf825f6f581b560b0de4b (diff) | |
download | mariadb-git-8df28e525bff27aa34fe08a57fabba578e12ffec.tar.gz |
Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
libmysql/libmysql.c:
Auto merged
sql-common/client.c:
Auto merged
tests/mysql_client_test.c:
Manually merged.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions