bk commit into 5.0 tree (msvensson:1.2308) BUG#20637

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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@stripped, 2006-12-22 00:16:34+01:00, msvensson@neptunus.(none) +1 -0
  BUG#20637: "load data concurrent infile" locks the table
    
  Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
  inside a stored routine and MySQL is compiled with Query Cache support
  (this is not in the manual).
    
  The problem was that the condition test of "we are inside stored routine"
  was reversed, thus CONCURRENT _worked only_ from stored routine.  The
  solution is to use proper condition test.
    
  No test case is provided because the test case would require a large
  amount of input, and it's hard to tell is SELECT is really blocked or
  just slow (subject to race).

  sql/sql_yacc.yy@stripped, 2006-12-22 00:16:30+01:00, msvensson@neptunus.(none) +2 -0
    Fix the condition of TL_WRITE_CONCURRENT_INSERT on LOAD DATA CONCURRENT,
    which was reversed, and return valid value if we are in SP.
    

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0.30-SP1

--- 1.494/sql/sql_yacc.yy	2006-12-22 00:16:43 +01:00
+++ 1.495/sql/sql_yacc.yy	2006-12-22 00:16:43 +01:00
@@ -7031,6 +7031,8 @@ load_data_lock:
               Ignore this option in SP to avoid problem with query cache
             */
             if (Lex->sphead != 0)
+              $$= YYTHD->update_lock_default;
+            else
 #endif
               $$= TL_WRITE_CONCURRENT_INSERT;
           }