diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-13 18:02:09 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-13 18:02:09 +0100 |
| commit | 9f390d04c6050893de90f837be477bd2ce1f79f0 (patch) | |
| tree | d5694ad43a9dfef1d4c41a72516a1e532e5d39bc /client/Makefile.am | |
| parent | 2ae92c6cd2faf3a137467d0206036c740c51afb8 (diff) | |
| parent | b727e09ce3e60aa8f84522d843e742dba9181421 (diff) | |
| download | mariadb-git-9f390d04c6050893de90f837be477bd2ce1f79f0.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
client/mysql_upgrade.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
vio/Makefile.am:
Auto merged
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
client/Makefile.am:
Use local
tests/Makefile.am:
SCCS merged
Diffstat (limited to 'client/Makefile.am')
0 files changed, 0 insertions, 0 deletions