diff options
| author | unknown <dlenev@mysql.com> | 2005-12-07 12:47:25 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-12-07 12:47:25 +0300 |
| commit | 8b3081fbe82f72837b59cf0369cfb87b5b4e337f (patch) | |
| tree | 58da2b1b1437e48f3ad5b672bc3afd7d72d95e21 /mysql-test/mysql-test-run.pl | |
| parent | 6617c77c4523c6a176797a9b76c79c8e60cf28f8 (diff) | |
| parent | 0c8e312caf22ed47b40148cfee4f98876c9176af (diff) | |
| download | mariadb-git-8b3081fbe82f72837b59cf0369cfb87b5b4e337f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/sp.cc:
Manual merge.
sql/sp.h:
Manual merge.
sql/sql_base.cc:
Manual merge.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
0 files changed, 0 insertions, 0 deletions