diff options
| -rw-r--r-- | BUILD/Makefile.am | 1 | ||||
| -rw-r--r-- | config/ac-macros/zlib.m4 | 4 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/r/key_cache.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/t/key_cache.test | 1 | ||||
| -rwxr-xr-x | sql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/federatedx/Makefile.am | 8 | ||||
| -rw-r--r-- | storage/pbxt/src/lock_xt.cc | 5 | ||||
| -rw-r--r-- | storage/xtradb/buf/buf0buf.c | 5 | ||||
| -rw-r--r-- | storage/xtradb/srv/srv0srv.c | 4 |
10 files changed, 23 insertions, 16 deletions
diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am index fefea99aa95..cf19291c9eb 100644 --- a/BUILD/Makefile.am +++ b/BUILD/Makefile.am @@ -54,7 +54,6 @@ EXTRA_DIST = FINISH.sh \ compile-pentium-icc-yassl \ compile-pentium-max \ compile-pentium-myodbc \ - compile-pentium-mysqlfs-debug \ compile-pentium-pgcc \ compile-pentium-valgrind-max \ compile-pentium64 \ diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index f62bb056249..64c1fb6d6b7 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -20,6 +20,10 @@ save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS" LIBS="$LIBS $ZLIB_LIBS" +case "$with_mysqld_ldflags " in + *"-all-static "*) + CPPFLAGS="$CPPFLAGS -static" +esac if test X"$with_server" = Xno then zlibsym=zlibVersion diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index e50e89082cd..f9ef76f29ec 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -153,6 +153,12 @@ ADD_LIBRARY(mysqlserver STATIC ${LIBMYSQLD_SOURCES}) ADD_DEPENDENCIES(mysqlserver GenServerSource GenError) TARGET_LINK_LIBRARIES(mysqlserver psapi.lib) +IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8) + # Workaround cmake bug http://www.vtk.org/Bug/view.php?id=11240 + SET_TARGET_PROPERTIES(mysqlserver PROPERTIES STATIC_LIBRARY_FLAGS + "/MACHINE:AMD64") +ENDIF() + # Add any additional libraries requested by engine(s) FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS}) STRING(TOUPPER ${ENGINE_LIB} ENGINE_LIB_UPPER) diff --git a/mysql-test/suite/pbxt/r/key_cache.result b/mysql-test/suite/pbxt/r/key_cache.result index 5ff41bd29d7..1ea3b2a714a 100644 --- a/mysql-test/suite/pbxt/r/key_cache.result +++ b/mysql-test/suite/pbxt/r/key_cache.result @@ -315,8 +315,7 @@ test.t1 check status OK DROP TABLE t1,t2; set global key_cache_block_size= @my_key_cache_block_size; set @@global.key_buffer_size=0; -Warnings: -Warning 1438 Cannot drop default keycache +ERROR HY000: Cannot drop default keycache select @@global.key_buffer_size; @@global.key_buffer_size 1048576 diff --git a/mysql-test/suite/pbxt/t/key_cache.test b/mysql-test/suite/pbxt/t/key_cache.test index 10dbdda6068..99d785db014 100644 --- a/mysql-test/suite/pbxt/t/key_cache.test +++ b/mysql-test/suite/pbxt/t/key_cache.test @@ -220,6 +220,7 @@ set global key_cache_block_size= @my_key_cache_block_size; # Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO # (One cannot drop the default key cache.) # +--error ER_WARN_CANT_DROP_DEFAULT_KEYCACHE set @@global.key_buffer_size=0; select @@global.key_buffer_size; diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 855f419730c..5856b795ba8 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -141,7 +141,7 @@ ADD_CUSTOM_TARGET( ${PROJECT_SOURCE_DIR}/sql/message.rc ${PROJECT_SOURCE_DIR}/sql/lex_hash.h) -ADD_DEPENDENCIES(mysqld GenServerSource) +ADD_DEPENDENCIES(sql GenServerSource) # Remove the auto-generated files as part of 'Clean Solution' SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES diff --git a/storage/federatedx/Makefile.am b/storage/federatedx/Makefile.am index 9ce0e4fe0f9..9296e9e00ea 100644 --- a/storage/federatedx/Makefile.am +++ b/storage/federatedx/Makefile.am @@ -21,23 +21,19 @@ EXTRA_LTLIBRARIES = libfederatedx.la libfederatedx_common.la libfederatedx_embed pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@ ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) ha_federatedx_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN -ha_federatedx_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN noinst_LTLIBRARIES = @plugin_federatedx_static_target@ @plugin_federatedx_embedded_static_target@ libfederatedx_common_la_CXXFLAGS = $(AM_CXXFLAGS) -libfederatedx_common_la_CFLAGS = $(AM_CFLAGS) libfederatedx_common_la_SOURCES= federatedx_txn.cc \ federatedx_io.cc federatedx_io_null.cc \ federatedx_io_mysql.cc -libfederatedx_la_CXXFLAGS = $(AM_CFLAGS) -libfederatedx_la_CFLAGS = $(AM_CFLAGS) +libfederatedx_la_CXXFLAGS = $(AM_CXXFLAGS) libfederatedx_la_LIBADD = libfederatedx_common.la libfederatedx_la_SOURCES= ha_federatedx.cc -libfederatedx_embedded_la_CXXFLAGS = $(AM_CFLAGS) @plugin_embedded_defs@ -libfederatedx_embedded_la_CFLAGS = $(AM_CFLAGS) @plugin_embedded_defs@ +libfederatedx_embedded_la_CXXFLAGS = $(AM_CXXCFLAGS) @plugin_embedded_defs@ libfederatedx_embedded_la_LDFLAGS = $(AM_LDFLAGS) libfederatedx_embedded_la_LIBADD = libfederatedx_common.la libfederatedx_embedded_la_SOURCES= ha_federatedx.cc diff --git a/storage/pbxt/src/lock_xt.cc b/storage/pbxt/src/lock_xt.cc index 0e9af277c7b..946adfecccc 100644 --- a/storage/pbxt/src/lock_xt.cc +++ b/storage/pbxt/src/lock_xt.cc @@ -2058,11 +2058,12 @@ static void lck_free_thread_data(XTThreadPtr XT_UNUSED(self), void *XT_UNUSED(da static void lck_do_job(XTThreadPtr self, int job, XSLockTestPtr data, xtBool reader) { - char b1[2048], b2[2048]; + char b1[1024], b2[1024]; switch (job) { case JOB_MEMCPY: - memcpy(b1, b2, 2048); + memset(b1, 0, sizeof(b1)); + memset(b2, 1, sizeof(b2)); data->xs_inc++; break; case JOB_SLEEP: diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c index b4fe99236e8..83c16379872 100644 --- a/storage/xtradb/buf/buf0buf.c +++ b/storage/xtradb/buf/buf0buf.c @@ -1076,8 +1076,9 @@ init_again: "InnoDB: Logical offset (blocks) : %ld (%#lx)\n", (byte*)chunk->mem + shm_info->frame_offset, chunk->blocks[0].frame, frame, - phys_offset, phys_offset, logi_offset, logi_offset, - blocks_offset, blocks_offset); + phys_offset, phys_offset, + (long) logi_offset, (long) logi_offset, + (long) blocks_offset, (long) blocks_offset); } else { fprintf(stderr, "InnoDB: Buffer pool in the shared memory segment can be used as it is.\n"); diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c index 9602a958faf..3cfdae6f70d 100644 --- a/storage/xtradb/srv/srv0srv.c +++ b/storage/xtradb/srv/srv0srv.c @@ -3083,8 +3083,8 @@ retry_flush_batch: blocks_sum += blocks_num; } - n_flush = blocks_sum * (lsn - lsn_old) / log_sys->max_modified_age_async; - if (flushed_blocks_sum > n_pages_flushed_prev) { + n_flush = (lint) (blocks_sum * (lsn - lsn_old) / log_sys->max_modified_age_async); + if ((ulint) flushed_blocks_sum > n_pages_flushed_prev) { n_flush -= (flushed_blocks_sum - n_pages_flushed_prev); } |