diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-30 11:31:51 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-30 11:31:51 +0100 |
| commit | 822c0590c46abb06ef538c438be879bc8e241882 (patch) | |
| tree | aef51d87692e0d93083603556f3a8a4fec380624 /client/Makefile.am | |
| parent | aaa853fa1f25ee9156f0a0036c34d250d84f9ee2 (diff) | |
| parent | daa14544e0bfc0784ceb90158e618698b6296e89 (diff) | |
| download | mariadb-git-822c0590c46abb06ef538c438be879bc8e241882.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/r/rpl_sp.result:
Manual merge
mysql-test/t/rpl_sp.test:
Manual merge
Diffstat (limited to 'client/Makefile.am')
0 files changed, 0 insertions, 0 deletions