bk commit into 5.0 tree (cmiller:1.2286)

[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@stripped, 2006-09-23 09:48:43-04:00, cmiller@stripped +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
  MERGE: 1.2271.1.12

  mysql-test/mysql-test-run.pl@stripped, 2006-09-23 09:48:36-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.114.1.1

  sql/Makefile.am@stripped, 2006-09-23 09:48:36-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.122.1.1

  sql/ha_innodb.cc@stripped, 2006-09-23 09:48:37-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.298.1.1

# 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.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-maint/RESYNC

--- 1.124/sql/Makefile.am	2006-09-23 09:48:51 -04:00
+++ 1.125/sql/Makefile.am	2006-09-23 09:48:51 -04:00
@@ -117,7 +117,8 @@ DEFS =			-DMYSQL_SERVER \
 
 BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h
 EXTRA_DIST =		$(BUILT_SOURCES) nt_servc.cc nt_servc.h \
-			message.mc examples/CMakeLists.txt CMakeLists.txt
+			message.mc examples/CMakeLists.txt CMakeLists.txt \
+			udf_example.c udf_example.def
 DISTCLEANFILES =        lex_hash.h sql_yacc.output
 
 AM_YFLAGS =		-d --debug --verbose

--- 1.119/mysql-test/mysql-test-run.pl	2006-09-23 09:48:51 -04:00
+++ 1.120/mysql-test/mysql-test-run.pl	2006-09-23 09:48:51 -04:00
@@ -1110,7 +1110,9 @@ sub executable_setup () {
     $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/ndb/tools");
     $exe_ndb_mgm=        "$glob_basedir/ndb/src/mgmclient/ndb_mgm";
     $lib_udf_example=
-      mtr_file_exists("$glob_basedir/sql/.libs/udf_example.so");
+      mtr_file_exists("$glob_basedir/sql/.libs/udf_example.so",
+                      "$glob_basedir/sql/release/udf_example.dll",
+                      "$glob_basedir/sql/debug/udf_example.dll");
   }
   else
   {

--- 1.299/sql/ha_innodb.cc	2006-09-23 09:48:51 -04:00
+++ 1.300/sql/ha_innodb.cc	2006-09-23 09:48:51 -04:00
@@ -5970,19 +5970,6 @@ ha_innobase::start_stmt(
 			prebuilt->select_lock_type =
 				prebuilt->stored_select_lock_type;
 		}
-
-		if (prebuilt->stored_select_lock_type != LOCK_S
-		    && prebuilt->stored_select_lock_type != LOCK_X) {
-		  sql_print_error("stored_select_lock_type is %lu inside "
-				  "::start_stmt()!",
-				  prebuilt->stored_select_lock_type);
-
-			/* Set the value to LOCK_X: this is just fault
-			tolerance, we do not know what the correct value
-			should be! */
-
-			prebuilt->select_lock_type = LOCK_X;
-		}
 	}
 
 	trx->detailed_error[0] = '\0';