diff options
author | unknown <lenz@mysql.com> | 2005-07-25 15:04:28 +0200 |
---|---|---|
committer | unknown <lenz@mysql.com> | 2005-07-25 15:04:28 +0200 |
commit | c15cab9636f4f2dec2a822a83fb86e3ea84f2d0f (patch) | |
tree | 355c539486c44f234050c46cd6f9c80c059d9849 /mysql-test/r/strict.result | |
parent | 0eea2a124bd5c8269a5382da9ac82526a5e2f384 (diff) | |
parent | fe862aa987b33cc44a31fc6f5051d5ba41ffd0c8 (diff) | |
download | mariadb-git-c15cab9636f4f2dec2a822a83fb86e3ea84f2d0f.tar.gz |
Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0-build
scripts/Makefile.am:
Auto merged
Diffstat (limited to 'mysql-test/r/strict.result')
0 files changed, 0 insertions, 0 deletions