From: Rafal Somla
Date: November 17 2011 11:50am
Subject: bzr push into mysql-trunk branch (rafal.somla:3619 to 3620) Bug#13101974
List-Archive: http://lists.mysql.com/commits/142011
X-Bug: 13101974
Message-Id: <201111171151.pAHBp5VJ032693@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3620 Rafal Somla	2011-11-17 [merge]
      Merge of bug#13101974

    modified:
      libmysql/CMakeLists.txt
      sql/CMakeLists.txt
 3619 Jimmy Yang	2011-11-17
      Fix bug #13400194 INNODB FTS SUPPORT: INNODB_FTS_LARGE_RECORDS DO NOT
      COMPLETE RUN ON WINDOWS. Also misc test cleanup:
      1) add sys_vars test for newly added FTS configure varaibles 
      2) removed fulltext_plugin.test

    removed:
      mysql-test/suite/innodb_fts/r/fulltext_plugin.result
      mysql-test/suite/innodb_fts/t/fulltext_plugin.test
    added:
      mysql-test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_aux_table_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_cache_size_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_enable_diag_print_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_enable_stopword_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_max_token_size_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_min_token_size_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_num_word_optimize_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_server_stopword_table_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_sort_pll_degree_basic.result
      mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result
      mysql-test/suite/sys_vars/r/innodb_optimize_fulltext_only_basic.result
      mysql-test/suite/sys_vars/r/innodb_sort_buf_size_basic.result
      mysql-test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_aux_table_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_cache_size_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_enable_diag_print_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_enable_stopword_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_max_token_size_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_num_word_optimize_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_server_stopword_table_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_sort_pll_degree_basic.test
      mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test
      mysql-test/suite/sys_vars/t/innodb_optimize_fulltext_only_basic.test
      mysql-test/suite/sys_vars/t/innodb_sort_buf_size_basic.test
    modified:
      mysql-test/suite/innodb_fts/t/disabled.def
      mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test
      mysql-test/suite/innodb_fts/t/innodb_fts_large_records.test
      mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
      mysql-test/suite/sys_vars/r/all_vars.result
      storage/innobase/handler/ha_innodb.cc
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2011-07-04 00:25:46 +0000
+++ b/libmysql/CMakeLists.txt	2011-11-17 11:40:29 +0000
@@ -134,12 +134,6 @@ CACHE INTERNAL "Functions exported by cl
 
 )
 
-IF(WIN32)
-  ADD_SUBDIRECTORY(authentication_win)
-  SET(WITH_AUTHENTICATION_WIN 1)
-  ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
-ENDIF(WIN32)
-
 SET(CLIENT_SOURCES
   get_password.c 
   libmysql.c
@@ -157,9 +151,15 @@ ADD_DEPENDENCIES(clientlib GenError)
 
 SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
 
-IF(WITH_AUTHENTICATION_WIN)
+#
+# On Windows platform client library includes the client-side 
+# Windows Native Authentication plugin.
+#
+IF(WIN32)
+  ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
+  ADD_SUBDIRECTORY(authentication_win)
   LIST(APPEND LIBS auth_win_client)
-ENDIF(WITH_AUTHENTICATION_WIN)
+ENDIF()
 
 # Merge several convenience libraries into one big mysqlclient
 # and link them together into shared library.

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2011-10-28 12:45:35 +0000
+++ b/sql/CMakeLists.txt	2011-11-17 11:40:29 +0000
@@ -190,6 +190,15 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
   ${SSL_LIBRARIES})
 
+#
+# On Windows platform we compile in the clinet-side Windows Native Authentication
+# plugin which is used by the client connection code included in the server.
+#
+IF(WIN32)
+  ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
+  TARGET_LINK_LIBRARIES(sql auth_win_client)
+ENDIF() 
+
 SET (BINLOG_SOURCE log_event.cc log_event_old.cc binlog.cc sql_binlog.cc
 		   rpl_filter.cc rpl_record.cc rpl_record_old.cc rpl_utility.cc
 		   rpl_injector.cc)

No bundle (reason: useless for push emails).