diff options
| author | unknown <davi@buzz.(none)> | 2008-03-17 16:13:59 -0300 |
|---|---|---|
| committer | unknown <davi@buzz.(none)> | 2008-03-17 16:13:59 -0300 |
| commit | ce34828e075347de7d783d3b61ce579856ca72ad (patch) | |
| tree | 278a06c5d7b0c6da3ee8bc65f506bf6a0480b385 /include | |
| parent | c1e69a77a6f6563214b5f5e8813db423c4f3a04c (diff) | |
| parent | 23d567aa7cb01811294a24ecda100d2a90fe8acf (diff) | |
| download | mariadb-git-ce34828e075347de7d783d3b61ce579856ca72ad.tar.gz | |
Merge buzz.(none):/home/davi/mysql-5.0-runtime
into buzz.(none):/home/davi/mysql-5.1-runtime
sql-common/client.c:
Auto merged
sql/sql_prepare.cc:
Manual merge
tests/mysql_client_test.c:
Manual merge
libmysql/libmysql.c:
Manual merge
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions