diff options
| author | unknown <sergefp@pslp.mylan> | 2008-04-22 03:36:24 +0400 |
|---|---|---|
| committer | unknown <sergefp@pslp.mylan> | 2008-04-22 03:36:24 +0400 |
| commit | 14177de7508c0cbeb2f82aa8c6032c9c0ccbb6e9 (patch) | |
| tree | 29a07c104c0bbafd7d6bc65a7fc0bc8bcfcfdac0 /sql/sql_select.cc | |
| parent | 48665aea0f3c3b4cc2f2350c887de4a34da62736 (diff) | |
| parent | 841821401f6f9c8e1800fcadfd81efb8bc0814d9 (diff) | |
| download | mariadb-git-14177de7508c0cbeb2f82aa8c6032c9c0ccbb6e9.tar.gz | |
Merge mysql.com:/home/psergey/mysql-5.0-bugteam
into mysql.com:/home/psergey/mysql-5.1-bugteam
BUG#36139: manual merge
sql/item.cc:
Auto merged
mysql-test/r/subselect.result:
BUG#36139: Manual merge
mysql-test/t/subselect.test:
BUG#36139: Manual merge
Diffstat (limited to 'sql/sql_select.cc')
0 files changed, 0 insertions, 0 deletions