diff options
author | unknown <malff/marcsql@weblab.(none)> | 2007-04-20 15:34:04 -0600 |
---|---|---|
committer | unknown <malff/marcsql@weblab.(none)> | 2007-04-20 15:34:04 -0600 |
commit | 594f7bd2feb50a4d8e84aee13f722ab8b0bb6ce6 (patch) | |
tree | 7aea580468c2c4f27ea57124b466983db2fe050a /sql/sp.cc | |
parent | 4a3027aaa22e947c36f398c45a2e77324c6492e4 (diff) | |
parent | 851505c076475e5e05733dc814db033e4c762bca (diff) | |
download | mariadb-git-594f7bd2feb50a4d8e84aee13f722ab8b0bb6ce6.tar.gz |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
Diffstat (limited to 'sql/sp.cc')
0 files changed, 0 insertions, 0 deletions