diff options
| author | unknown <andrey@example.com> | 2006-09-27 22:25:23 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-09-27 22:25:23 +0200 |
| commit | ca48feceee0737619aed37232df3ba8811a8394d (patch) | |
| tree | c7b3157c76b879cece25cc6cb05942519a25764f /sql/Makefile.am | |
| parent | afedaa108977d8de05af6fd5915d4a86bdbe91ff (diff) | |
| parent | fcb8687ad98ea57bfe8d12d36af1432561054565 (diff) | |
| download | mariadb-git-ca48feceee0737619aed37232df3ba8811a8394d.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into example.com:/work/mysql-5.0-runtime
mysql-test/t/sp.test:
Auto merged
sql/sp.cc:
Auto merged
mysql-test/r/sp.result:
manual merge
Diffstat (limited to 'sql/Makefile.am')
0 files changed, 0 insertions, 0 deletions