[teiid-commits] [teiid/teiid] 60b7af: TEIID-3025 correcting subquery in order by handlin...

[shawkins]

  Branch: refs/heads/8.7.x
  Home:   https://github.com/teiid/teiid
  Commit: 60b7aff7ea574d526435a4a3c19ca4154d8442c6
      https://github.com/teiid/teiid/commit/60b7aff7ea574d526435a4a3c19ca4154d8442c6
  Author: shawkins <shawkins at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/plantree/PlanNode.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleCollapseSource.java
    M engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java
    M engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java

  Log Message:
  -----------
  TEIID-3025 correcting subquery in order by handling


  Commit: 4d68e5c09014d8d46186c1b944b3240601ecd49c
      https://github.com/teiid/teiid/commit/4d68e5c09014d8d46186c1b944b3240601ecd49c
  Author: shawkins <shawkins at redhat.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M client/src/main/java/org/teiid/jdbc/StatementImpl.java
    M client/src/main/java/org/teiid/jdbc/TeiidSQLException.java
    M engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
    M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java

  Log Message:
  -----------
  TEIID-3024 correcting local synch timeout and make the timeout exception
better
Conflicts:

	runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java


Compare: https://github.com/teiid/teiid/compare/b4ff415820f9...4d68e5c09014