bzr commit into mysql-5.5-next-mr branch (holyfoot:2984) Bug#41103

[Alexey Botchkov]

#At file:///home/hf/work/mysql_common/41103/ based on revid:zhenxing.he@stripped

 2984 Alexey Botchkov	2010-02-04
      Bug#41103      6.0 Windows embedded-server tests fail
          Two problems addressed here:
             Embedded-server linking failure.
                sql/sys_vars.cc absents in the libmysqld/CMakeLists.txt
             The PERFORMANCE_SCHEMA-related failure of the embedded-server compilation.
                We try to disable the PERFORMANCE_SCHEMA in the embedded server
                as it's considered useless there. But we do it in wrong way as
                we only disable header's links to the PF, not the PF's library itself.
                So on Unix-ex the embedded library still contains the PF code and
                grows bigger with no reason. On Windows that just fails to compile.
             
      per-file comments:
        include/my_global.h
      Bug#41103      6.0 Windows embedded-server tests fail
            No PERFORMANCE_SCHEMA disabling in the embedded server. User can
            just use the --without-perfschema-engine-plugin option to exclude it
            from the compilation.
        libmysqld/CMakeLists.txt
      Bug#41103      6.0 Windows embedded-server tests fail
            sql/sys_vars.cc added to the 'mysqlserver' library

    modified:
      include/my_global.h
      libmysqld/CMakeLists.txt
=== modified file 'include/my_global.h'
--- a/include/my_global.h	2009-12-22 09:35:56 +0000
+++ b/include/my_global.h	2010-02-04 13:37:25 +0000
@@ -83,12 +83,6 @@
 #endif
 #endif /* _WIN32... */
 
-#ifdef EMBEDDED_LIBRARY
-#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
-#undef WITH_PERFSCHEMA_STORAGE_ENGINE
-#endif
-#endif /* EMBEDDED_LIBRARY */
-
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
 #define HAVE_PSI_INTERFACE
 #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */

=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2010-01-19 13:30:55 +0000
+++ b/libmysqld/CMakeLists.txt	2010-02-04 13:37:25 +0000
@@ -134,7 +134,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libm
            ../sql/partition_info.cc ../sql/sql_connect.cc 
            ../sql/scheduler.cc ../sql/sql_audit.cc
            ../sql/event_parse_data.cc
-           ../sql/sql_signal.cc ../sql/rpl_handler.cc
+           ../sql/sql_signal.cc ../sql/rpl_handler.cc ../sql/sys_vars.cc
            ${GEN_SOURCES}
            ${LIB_SOURCES})
 


Attachment: [text/bzr-bundle] bzr/[e-mail]