bk commit into 5.1 tree (jani:1.1965)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani 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.1965 05/12/14 09:42:05 jani@stripped +4 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

  sql/mysqld.cc
    1.502 05/12/14 09:41:59 jani@stripped +0 -1
    Merged from 5.0

  sql/handler.cc
    1.196 05/12/14 09:41:59 jani@stripped +0 -3
    Merged from 5.0

  mysql-test/t/disabled.def
    1.23 05/12/14 09:41:59 jani@stripped +1 -1
    Merged from 5.0

  extra/Makefile.am
    1.33 05/12/14 09:28:28 jani@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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.1-new/RESYNC

--- 1.32/extra/Makefile.am	2005-11-23 14:04:05 +02:00
+++ 1.33/extra/Makefile.am	2005-12-14 09:28:28 +02:00
@@ -29,8 +29,8 @@
 DIST_SUBDIRS=           yassl
 
 # This will build mysqld_error.h and sql_state.h
-$(top_builddir)/include/mysqld_error.h: comp_err
-	$(top_builddir)/extra/comp_err \
+$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
+	$(top_builddir)/extra/comp_err$(EXEEXT) \
 	--charset=$(top_srcdir)/sql/share/charsets \
 	--out-dir=$(top_builddir)/sql/share/ \
 	--header_file=$(top_builddir)/include/mysqld_error.h \

--- 1.22/mysql-test/t/disabled.def	2005-12-07 13:59:35 +02:00
+++ 1.23/mysql-test/t/disabled.def	2005-12-14 09:41:59 +02:00
@@ -18,3 +18,4 @@
 func_math       : Bug #15448
 group_min_max   : Bug #15448 
 mysqlslap       : Bug #15483
+subselect       : Bug #15706