bk commit into 5.0 tree (cmiller:1.2154)

[Chad MILLER]

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.2154 06/04/13 12:56:20 cmiller@zippy.(none) +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0

  sql/sql_parse.cc
    1.538 06/04/13 12:56:15 cmiller@zippy.(none) +0 -0
    Auto merged

  mysys/Makefile.am
    1.69 06/04/13 12:56:15 cmiller@zippy.(none) +0 -0
    Auto merged

# 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/merge/mysql-5.0/RESYNC

--- 1.68/mysys/Makefile.am	2006-04-05 16:49:12 -04:00
+++ 1.69/mysys/Makefile.am	2006-04-13 12:56:15 -04:00
@@ -71,6 +71,7 @@
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
 			-DDEFAULT_HOME_ENV=MYSQL_HOME \
 			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
+			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
                         @DEFS@
 
 libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@

--- 1.537/sql/sql_parse.cc	2006-04-05 16:49:12 -04:00
+++ 1.538/sql/sql_parse.cc	2006-04-13 12:56:15 -04:00
@@ -3350,7 +3350,7 @@
       Don't allow this within a transaction because we want to use
       re-generate table
     */
-    if ((thd->locked_tables && !lex->sphead) || thd->active_transaction())
+    if (thd->locked_tables || thd->active_transaction())
     {
       my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
                  ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));