diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-05-04 18:35:58 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-05-04 18:35:58 +0300 |
| commit | f31cb5dd8e95aaab551da800305484115387fafa (patch) | |
| tree | d884911cd233444e15219563b5ace4430095caf9 /mysql-test/r/ssl.result | |
| parent | 8570020c788c6be103982177501c599783dca419 (diff) | |
| parent | ac94170069e4de0447fa5b76a1e38a437a66a197 (diff) | |
| download | mariadb-git-f31cb5dd8e95aaab551da800305484115387fafa.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/ansi.result:
Merged from 4.1
mysql-test/r/auto_increment.result:
Merged from 4.1
mysql-test/r/mysqldump.result:
Merged from 4.1
mysql-test/r/symlink.result:
Merged from 4.1
mysql-test/t/auto_increment.test:
Merged from 4.1
mysql-test/t/mysqldump.test:
Merged from 4.1
sql/set_var.cc:
Merged from 4.1
sql/sql_show.cc:
Merged from 4.1
Diffstat (limited to 'mysql-test/r/ssl.result')
0 files changed, 0 insertions, 0 deletions