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 | f77686df0d15757ee4003ec42e4d1268b1137dd5 (patch) | |
tree | ac3aa6164de2c626ea1a053059068240ca07a75e /include | |
parent | f20fe94b55727fbc69b1cb86af5dc96f216bdd87 (diff) | |
parent | 23d567aa7cb01811294a24ecda100d2a90fe8acf (diff) | |
download | mariadb-git-f77686df0d15757ee4003ec42e4d1268b1137dd5.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