From: Date: May 23 2006 4:30pm
Subject: bk commit into 5.0 tree (cmiller:1.2146) BUG#11151
List-Archive: http://lists.mysql.com/commits/6775
X-Bug: 11151
Message-Id: <20060523143004.AC3C95C053@zippy>

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2146 06/05/23 10:29:58 cmiller@zippy.(none) +1 -0
  Guilhelm suggested that the "load data infile" command should be flagged as
  not transaction-safe for stored procedures.  Related to Bug#11151.

  sql/sp_head.cc
    1.206 06/05/23 10:29:54 cmiller@zippy.(none) +1 -0
    Guilhelm suggested that the "load data infile" command should be flagged as
    not transaction-safe for stored procedures.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/mysql-5.0--bug11151

--- 1.205/sql/sp_head.cc	2006-03-21 08:35:45 -05:00
+++ 1.206/sql/sp_head.cc	2006-05-23 10:29:54 -04:00
@@ -247,6 +247,7 @@
   case SQLCOM_TRUNCATE:
   case SQLCOM_COMMIT:
   case SQLCOM_ROLLBACK:
+  case SQLCOM_LOAD:
   case SQLCOM_LOAD_MASTER_DATA:
   case SQLCOM_LOCK_TABLES:
   case SQLCOM_CREATE_PROCEDURE: