bk commit into 5.1 tree (knielsen:1.2245)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2245 06/03/28 13:53:22 knielsen@stripped +5 -0
  Merge mysqldev@win2003-x86:my/mysql-5.1-new
  into  mysql.com:/usr/local/mysql/mysql-5.1-win-src

  sql/sql_insert.cc
    1.193 06/03/28 13:53:14 knielsen@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.551 06/03/28 13:53:14 knielsen@stripped +0 -0
    Auto merged

  sql/Makefile.am
    1.135 06/03/28 13:53:14 knielsen@stripped +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.95 06/03/28 13:53:14 knielsen@stripped +0 -0
    Auto merged

  configure.in
    1.355 06/03/28 13:53:14 knielsen@stripped +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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-win-src/RESYNC

--- 1.134/sql/Makefile.am	2006-03-24 23:24:20 +01:00
+++ 1.135/sql/Makefile.am	2006-03-28 13:53:14 +02:00
@@ -124,7 +124,7 @@
 			@DEFS@
 
 BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h
-EXTRA_DIST =		udf_example.cc handlerton-win.cc $(BUILT_SOURCES) \
+EXTRA_DIST =		udf_example.cc $(BUILT_SOURCES) \
 			nt_servc.cc nt_servc.h message.mc cmakelists.txt
 CLEANFILES =        	lex_hash.h sql_yacc.cc sql_yacc.h
 AM_YFLAGS =		-d