Commit fd1bd754 authored by kent/mysqldev@mysql.com/production.mysql.com's avatar kent/mysqldev@mysql.com/production.mysql.com
Browse files

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
parent 4002e5c3

libmysqld/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc 
           ../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})

mysql-test/r/query_cache_debug.result

+1 −1
Original line number Diff line number Diff line 
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');

mysql-test/t/query_cache_debug.test

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/Makefile.am

+7 −1
Original line number Diff line number Diff line
@@ -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.%

sql/mysqld.cc

+2 −0
Original line number Diff line number Diff line
@@ -1948,6 +1948,7 @@ extern "C" sig_handler abort_thread(int sig __attribute__((unused))) 
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( DWORD type ) 
       sql_print_warning("CTRL-C ignored during startup");

     DBUG_RETURN(TRUE);

  }

#endif

  DBUG_RETURN(FALSE);

}