diff options
| author | unknown <ibabaev@bk-internal.mysql.com> | 2007-06-02 00:57:25 +0200 |
|---|---|---|
| committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-06-02 00:57:25 +0200 |
| commit | bcfe3d30151b7ccec9ea4222a517e77af594e229 (patch) | |
| tree | 5339c6747631cb919dd972d0b8a25a0958bceba5 /mysql-test/r/help.result | |
| parent | 1b4234e43cece93593558bda32ec84622028168e (diff) | |
| parent | 75485dc3498596b53d3e0eb04e6f4fe101996908 (diff) | |
| download | mariadb-git-bcfe3d30151b7ccec9ea4222a517e77af594e229.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/subselect3.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/help.result')
0 files changed, 0 insertions, 0 deletions