diff options
author | unknown <malff/marcsql@weblab.(none)> | 2007-02-06 16:10:06 -0700 |
---|---|---|
committer | unknown <malff/marcsql@weblab.(none)> | 2007-02-06 16:10:06 -0700 |
commit | 22f242cd4013434d2d2d06344112309e77d21ee1 (patch) | |
tree | 1b82beb02e575fca2b519379d045597987ebe118 /mysql-test/r/rpl_many_optimize.result | |
parent | 54aed8711a59ac5c24a3f0c00e072d3b7e5a52ea (diff) | |
parent | 372fc7e443eaa6fcffd1cb33e9f8a28e2e76542a (diff) | |
download | mariadb-git-22f242cd4013434d2d2d06344112309e77d21ee1.tar.gz |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-12976_b
into weblab.(none):/home/marcsql/TREE/mysql-5.1-12976-merge
mysql-test/r/sp-vars.result:
Auto merged
mysql-test/t/sp-vars.test:
Auto merged
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/rpl_many_optimize.result')
0 files changed, 0 insertions, 0 deletions