diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-07 09:35:46 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-07 09:35:46 +0200 |
| commit | 8628f2c8614cecdbd12555d84d14d8027be1bee5 (patch) | |
| tree | 6c96895f932fcc411fc352b97b6ca8e5719a055c /extra | |
| parent | b025657bcab0ed0529cc0fa6c43ea87025e894a6 (diff) | |
| parent | 745181ce2023908df3657e7514e0681b7c0857b5 (diff) | |
| download | mariadb-git-8628f2c8614cecdbd12555d84d14d8027be1bee5.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
mysql-test/t/mysqltest.test:
Auto merged
sql/sql_parse.cc:
Auto merged
client/mysqltest.c:
Manual merge
sql/hostname.cc:
Manual merge
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions