[teiid-commits] [teiid/teiid] 703497: TEIID-2152 ensuring merge works in batched updates

[shawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: 703497e236a8f3bd431026c73339d43a4c739b2d
      https://github.com/teiid/teiid/commit/703497e236a8f3bd431026c73339d43a4c739b2d
  Author: shawkins <shawkins at redhat.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java
    M engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java
    M engine/src/main/java/org/teiid/query/sql/util/VariableContext.java
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatement.java
    M engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatementBatchedUpdate.java

  Log Message:
  -----------
  TEIID-2152 ensuring merge works in batched updates