diff options
| author | unknown <msvensson@shellback.(none)> | 2006-05-29 16:31:18 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-05-29 16:31:18 +0200 |
| commit | 9186349ef4b8fa8ac7f406f119c008d3749ffd0a (patch) | |
| tree | 60b6ae8f31e635c12d80304b433dea6eb0e8dcf9 /mysql-test/t/rpl_variables.test | |
| parent | f5b969f42147bb60bee8cd7a725757b7a7f5feb0 (diff) | |
| parent | 5c1b4afb447802bbfbbede5f4c03bda8bc8f4d58 (diff) | |
| download | mariadb-git-9186349ef4b8fa8ac7f406f119c008d3749ffd0a.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint_from_5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl_variables.test')
0 files changed, 0 insertions, 0 deletions