bzr commit into mysql-6.0 tree (Matthias.Leich:2832) Bug#32858

[Matthias Leich]

#At file:///work2/6.0/mysql-6.0-bugteam-federated/

------------------------------------------------------------
revno: 2832
revision-id: matthias.leich@stripped
parent: matthias.leich@stripped
parent: mhansson@stripped
committer: Matthias Leich <Matthias.Leich@stripped>
branch nick: mysql-6.0-bugteam-federated
timestamp: Mo 2008-09-15 17:33:14 +0200
message:
  Merge actual bugteam tree into local tree
modified:
  mysql-test/r/union.result      sp1f-unions_one.result-20010725122836-ofxtwraxeohz7whhrmfdz57sl4a5prmp
  mysql-test/t/union.test        sp1f-unions_one.test-20010725122836-57cnbpjvizewgwar32kmidvvj6jsf7rz
  sql/sql_yacc.yy                sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
    ------------------------------------------------------------
    revno: 2829.1.10
    revision-id: mhansson@stripped
    parent: bar@stripped
    parent: mhansson@stripped
    committer: Martin Hansson <mhansson@stripped>
    branch nick: 6.0bt-bug32858-6.0-push
    timestamp: Mo 2008-09-15 16:06:56 +0200
    message:
      Bug#32858: Auto merged.
    modified:
      mysql-test/r/union.result      sp1f-unions_one.result-20010725122836-ofxtwraxeohz7whhrmfdz57sl4a5prmp
      mysql-test/t/union.test        sp1f-unions_one.test-20010725122836-57cnbpjvizewgwar32kmidvvj6jsf7rz
      sql/sql_yacc.yy                sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
    ------------------------------------------------------------
    revno: 2825.1.1
    revision-id: mhansson@stripped
    parent: kgeorge@stripped
    committer: Martin Hansson <mhansson@stripped>
    branch nick: 6.0bt-bug32858-6.0
    timestamp: Mo 2008-09-15 15:43:42 +0200
    message:
      Bug#32858: Error: "Incorrect usage of UNION and INTO" does not 
      take subselects into account
      
      When parsing a new UNION branch, there is a check if the previous
      branch contained INTO, which would be illegal syntax. But this is
      only the case if the new branch is on the top-level.
      Fixed in 6.0 by introducing a boolean argument so that the check
      is disabled when parsing nested UNION expressions. 
    modified:
      mysql-test/r/union.result      sp1f-unions_one.result-20010725122836-ofxtwraxeohz7whhrmfdz57sl4a5prmp
      mysql-test/t/union.test        sp1f-unions_one.test-20010725122836-57cnbpjvizewgwar32kmidvvj6jsf7rz
      sql/sql_yacc.yy                sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j

Attachment: [text/text/x-diff] patch-2832.diff