diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:00:54 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:00:54 +0200 |
| commit | 0ae18e489998cada52e6910c69d615dfa0094530 (patch) | |
| tree | cab20fd69d3450e59c240fdca1a7305d4dd1c98e /tests | |
| parent | a397d1f7149dcdeac86e9e4870780dcd8e99a908 (diff) | |
| parent | 69d1cce20a90b223e414e60d746f34bd53ba018d (diff) | |
| download | mariadb-git-0ae18e489998cada52e6910c69d615dfa0094530.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions