diff options
| author | unknown <igor@olga.mysql.com> | 2006-12-12 11:53:09 -0800 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2006-12-12 11:53:09 -0800 |
| commit | 22192d083ace932c5ee2c29b550012648ebf245e (patch) | |
| tree | 68fa80dd5079e1ad36b1d2265cf1e000ebcd53fc /sql/add_errmsg | |
| parent | 4108725364e4271ceedea644875e1abac00c2dc4 (diff) | |
| parent | 33446269e18d0506802ca89df30f89e3e5978154 (diff) | |
| download | mariadb-git-22192d083ace932c5ee2c29b550012648ebf245e.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
into olga.mysql.com:/home/igor/mysql-5.0-opt
sql/item_subselect.cc:
Auto merged
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/subselect.test:
Manual merge
sql/item_subselect.h:
Manual merge
Diffstat (limited to 'sql/add_errmsg')
0 files changed, 0 insertions, 0 deletions