bk commit into 5.1 tree (kent:1.2564) BUG#35749

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent.  When kent 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, 2008-04-02 00:43:17+02:00, kent@stripped +5 -0
  mysqld.cc:
    Corrects build problems embedded on Windows
  Makefile.am:
    Install .sym or mysqld-debug if exists
  query_cache_debug.test, query_cache_debug.result:
    Set more resonable query cache size (bug#35749)
  CMakeLists.txt:
    Added missing stacktrace.c

  libmysqld/CMakeLists.txt@stripped, 2008-04-02 00:33:24+02:00, kent@stripped +1 -1
    Added missing stacktrace.c

  mysql-test/r/query_cache_debug.result@stripped, 2008-04-01 21:14:19+02:00, kent@stripped +1 -1
    Set more resonable query cache size (bug#35749)

  mysql-test/t/query_cache_debug.test@stripped, 2008-04-01 21:14:19+02:00, kent@stripped +1 -1
    Set more resonable query cache size (bug#35749)

  sql/Makefile.am@stripped, 2008-04-02 00:33:51+02:00, kent@stripped +7 -1
    Install .sym or mysqld-debug if exists

  sql/mysqld.cc@stripped, 2008-04-02 00:42:29+02:00, kent@stripped +2 -0
    Corrects build problems embedded on Windows

diff -Nrup a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
--- a/libmysqld/CMakeLists.txt	2008-02-18 14:46:28 +01:00
+++ b/libmysqld/CMakeLists.txt	2008-04-02 00:33:24 +02:00
@@ -187,7 +187,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libm
            ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
            ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
            ../sql/partition_info.cc ../sql/sql_connect.cc 
-           ../sql/scheduler.cc
+           ../sql/scheduler.cc ../sql/stacktrace.c
            ${GEN_SOURCES}
            ${LIB_SOURCES})
 
diff -Nrup a/mysql-test/r/query_cache_debug.result b/mysql-test/r/query_cache_debug.result
--- a/mysql-test/r/query_cache_debug.result	2008-01-11 14:16:44 +01:00
+++ b/mysql-test/r/query_cache_debug.result	2008-04-01 21:14:19 +02:00
@@ -1,6 +1,6 @@
 flush status;
 set query_cache_type=DEMAND;
-set global query_cache_size= 1024*1024*512;
+set global query_cache_size= 1024*768;
 drop table if exists t1;
 create table t1 (a varchar(100));
 insert into t1 values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
diff -Nrup a/mysql-test/t/query_cache_debug.test b/mysql-test/t/query_cache_debug.test
--- a/mysql-test/t/query_cache_debug.test	2008-01-11 14:16:44 +01:00
+++ b/mysql-test/t/query_cache_debug.test	2008-04-01 21:14:19 +02:00
@@ -7,7 +7,7 @@
 #
 flush status;
 set query_cache_type=DEMAND;
-set global query_cache_size= 1024*1024*512;
+set global query_cache_size= 1024*768;
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
diff -Nrup a/sql/Makefile.am b/sql/Makefile.am
--- a/sql/Makefile.am	2008-03-06 16:12:59 +01:00
+++ b/sql/Makefile.am	2008-04-02 00:33:51 +02:00
@@ -54,7 +54,7 @@ noinst_HEADERS =	item.h item_func.h item
 			procedure.h sql_class.h sql_lex.h sql_list.h \
 			sql_map.h sql_string.h unireg.h \
 			sql_error.h field.h handler.h mysqld_suffix.h \
- 			sql_profile.h \
+			sql_profile.h \
 			ha_ndbcluster.h ha_ndbcluster_cond.h \
 			ha_ndbcluster_binlog.h ha_ndbcluster_tables.h \
 			ha_partition.h rpl_constants.h \
@@ -178,6 +178,12 @@ lex_hash.h:	gen_lex_hash.cc lex.h
 udf_example_la_SOURCES= udf_example.c
 udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
 
+# We might have some stuff not built in this build, but that we want to install
+install-exec-hook:
+	$(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(pkglibdir)
+	test ! -x mysqld-debug$(EXEEXT) || $(INSTALL_PROGRAM) mysqld-debug$(EXEEXT) $(DESTDIR)$(libexecdir)
+	test ! -f mysqld-debug.sym.gz   || $(INSTALL_DATA)    mysqld-debug.sym.gz   $(DESTDIR)$(pkglibdir)
+	test ! -f mysqld.sym.gz         || $(INSTALL_DATA)    mysqld.sym.gz         $(DESTDIR)$(pkglibdir)
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2008-03-31 09:40:36 +02:00
+++ b/sql/mysqld.cc	2008-04-02 00:42:29 +02:00
@@ -1948,6 +1948,7 @@ extern "C" sig_handler abort_thread(int 
 static BOOL WINAPI console_event_handler( DWORD type ) 
 {
   DBUG_ENTER("console_event_handler");
+#ifndef EMBEDDED_LIBRARY
   if(type == CTRL_C_EVENT)
   {
      /*
@@ -1962,6 +1963,7 @@ static BOOL WINAPI console_event_handler
        sql_print_warning("CTRL-C ignored during startup");
      DBUG_RETURN(TRUE);
   }
+#endif
   DBUG_RETURN(FALSE);
 }