summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/my_pthread.h5
-rwxr-xr-xmysql-test/mysql-test-run.pl14
-rwxr-xr-xscripts/make_win_bin_dist6
-rwxr-xr-xserver-tools/instance-manager/CMakeLists.txt2
-rwxr-xr-xsql/CMakeLists.txt3
-rw-r--r--storage/innodb_plugin/CMakeLists.txt19
-rw-r--r--storage/xtradb/CMakeLists.txt20
-rw-r--r--storage/xtradb/include/fsp0types.h2
-rw-r--r--win/configure-mariadb.bat8
9 files changed, 51 insertions, 28 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 169225c1e9b..ef17ad48cb6 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -128,8 +128,9 @@ struct tm *gmtime_r(const time_t *timep,struct tm *tmp);
void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/
-#ifndef ETIMEDOUT
-#define ETIMEDOUT 145
+
+#ifndef ETIMEDOUT
+#define ETIMEDOUT 145 /* Win32 doesn't have this */
#endif
#define getpid() GetCurrentThreadId()
#define HAVE_LOCALTIME_R 1
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c32edf81f27..bc88d0d43f9 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2513,14 +2513,12 @@ sub fix_vs_config_dir () {
my $modified = 1e30;
$opt_vs_config="";
- for my $dir (qw(client/*.dir libmysql/libmysql.dir sql/mysqld.dir
- sql/udf_example.dir storage/*/*.dir plugin/*/*.dir)) {
- for (<$basedir/$dir/*/BuildLog.htm>) {
- if (-M $_ < $modified)
- {
- $modified = -M _;
- $opt_vs_config = basename(dirname($_));
- }
+
+ for (<$basedir/sql/*/mysqld.exe>) {
+ if (-M $_ < $modified)
+ {
+ $modified = -M _;
+ $opt_vs_config = basename(dirname($_));
}
}
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index 8940c8b4eb4..3691cf2ba77 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -163,7 +163,9 @@ if [ -f "storage/pbxt/bin/xtstat.exe" ] ; then
cp storage/pbxt/bin/xtstat.{exe,pdb} $DESTDIR/bin
fi
-cp server-tools/instance-manager/$TARGET/*.exe $DESTDIR/bin/
+
+cp server-tools/instance-manager/$TARGET/*.exe $DESTDIR/bin/
+
if [ x"$TARGET" != x"release" ] ; then
cp server-tools/instance-manager/$TARGET/*.pdb $DESTDIR/bin/
cp client/$TARGET/mysql.pdb $DESTDIR/bin/
@@ -177,7 +179,6 @@ cp tests/$TARGET/*.exe $DESTDIR/bin/
cp libmysql/$TARGET/libmysql.dll $DESTDIR/bin/
cp sql/$TARGET/mysqld.exe $DESTDIR/bin/mysqld$EXE_SUFFIX.exe
-cp sql/$TARGET/mysqld.map $DESTDIR/bin/mysqld$EXE_SUFFIX.map
if [ x"$TARGET" != x"release" ] ; then
cp sql/$TARGET/mysqld.pdb $DESTDIR/bin/mysqld$EXE_SUFFIX.pdb
fi
@@ -186,7 +187,6 @@ if [ x"$PACK_DEBUG" = x"" -a -f "sql/debug/mysqld.exe" -o \
x"$PACK_DEBUG" = x"yes" ] ; then
cp sql/debug/mysqld.exe $DESTDIR/bin/mysqld-debug.exe
cp sql/debug/mysqld.pdb $DESTDIR/bin/mysqld-debug.pdb
- cp sql/debug/mysqld.map $DESTDIR/bin/mysqld-debug.map
fi
# ----------------------------------------------------------------------
diff --git a/server-tools/instance-manager/CMakeLists.txt b/server-tools/instance-manager/CMakeLists.txt
index 2d04e522a6d..813a07a6b1d 100755
--- a/server-tools/instance-manager/CMakeLists.txt
+++ b/server-tools/instance-manager/CMakeLists.txt
@@ -20,7 +20,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
ADD_DEFINITIONS(-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/sql
${PROJECT_SOURCE_DIR}/extra/yassl/include)
-
+
ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instance.cc instance_map.cc
instance_options.cc listener.cc log.cc manager.cc messages.cc mysql_connection.cc
mysqlmanager.cc options.cc parse.cc parse_output.cc priv.cc protocol.cc
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index b431ee075fe..44b25cac9b4 100755
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -18,7 +18,8 @@ SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
SET(CMAKE_C_FLAGS_DEBUG
"${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
+
+SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/extra/yassl/include
diff --git a/storage/innodb_plugin/CMakeLists.txt b/storage/innodb_plugin/CMakeLists.txt
index 87318ceec78..f79962e1c24 100644
--- a/storage/innodb_plugin/CMakeLists.txt
+++ b/storage/innodb_plugin/CMakeLists.txt
@@ -40,12 +40,19 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/extra/yassl/include)
-# Removing compiler optimizations for innodb/mem/* files on 64-bit Windows
-# due to 64-bit compiler error, See MySQL Bug #19424, #36366, #34297
-IF (MSVC AND $(WIN64))
- SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c
- PROPERTIES COMPILE_FLAGS -Od)
-ENDIF (MSVC AND $(WIN64))
+IF(MSVC)
+ # Removing compiler optimizations for innodb/mem/* files on 64-bit Windows
+ # due to 64-bit compiler error, See MySQL Bug #19424, #36366, #34297
+ IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
+ SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c
+ PROPERTIES COMPILE_FLAGS -Od)
+ ENDIF()
+ # Avoid "unreferenced label" warning in generated file
+ SET_SOURCE_FILES_PROPERTIES(pars/pars0grm.c
+ PROPERTIES COMPILE_FLAGS "/wd4102")
+ SET_SOURCE_FILES_PROPERTIES(pars/lexyy.c
+ PROPERTIES COMPILE_FLAGS "/wd4003")
+ENDIF()
SET(INNODB_PLUGIN_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
buf/buf0buddy.c buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c
diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt
index 759bb525bdf..0187cf097c1 100644
--- a/storage/xtradb/CMakeLists.txt
+++ b/storage/xtradb/CMakeLists.txt
@@ -42,12 +42,20 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/extra/yassl/include)
-# Removing compiler optimizations for innodb/mem/* files on 64-bit Windows
-# due to 64-bit compiler error, See MySQL Bug #19424, #36366, #34297
-IF (MSVC AND $(WIN64))
- SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c
- PROPERTIES COMPILE_FLAGS -Od)
-ENDIF (MSVC AND $(WIN64))
+
+IF(MSVC)
+ # Removing compiler optimizations for innodb/mem/* files on 64-bit Windows
+ # due to 64-bit compiler error, See MySQL Bug #19424, #36366, #34297
+ IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
+ SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c
+ PROPERTIES COMPILE_FLAGS -Od)
+ ENDIF()
+ # Avoid "unreferenced label" warning in generated file
+ SET_SOURCE_FILES_PROPERTIES(pars/pars0grm.c
+ PROPERTIES COMPILE_FLAGS "/wd4102")
+ SET_SOURCE_FILES_PROPERTIES(pars/lexyy.c
+ PROPERTIES COMPILE_FLAGS "/wd4003")
+ENDIF()
SET(XTRADB_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
buf/buf0buddy.c buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c
diff --git a/storage/xtradb/include/fsp0types.h b/storage/xtradb/include/fsp0types.h
index 2dd2deca671..6678dacb547 100644
--- a/storage/xtradb/include/fsp0types.h
+++ b/storage/xtradb/include/fsp0types.h
@@ -42,7 +42,7 @@ fseg_alloc_free_page) */
/* @} */
/** File space extent size (one megabyte) in pages */
-#define FSP_EXTENT_SIZE (1u << (20 - UNIV_PAGE_SIZE_SHIFT))
+#define FSP_EXTENT_SIZE (1ULL << (20 - UNIV_PAGE_SIZE_SHIFT))
/** On a page of any file segment, data may be put starting from this
offset */
diff --git a/win/configure-mariadb.bat b/win/configure-mariadb.bat
new file mode 100644
index 00000000000..834d73732b8
--- /dev/null
+++ b/win/configure-mariadb.bat
@@ -0,0 +1,8 @@
+cscript win\configure.js ^
+ WITH_EXAMPLE_STORAGE_ENGINE ^
+ WITH_FEDERATEDX_STORAGE_ENGINE ^
+ WITH_MERGE_STORAGE_ENGINE ^
+ WITH_PARTITION_STORAGE_ENGINE ^
+ WITH_MARIA_STORAGE_ENGINE ^
+ WITH_PBXT_STORAGE_ENGINE ^
+ WITH_XTRADB_STORAGE_ENGINE
View Lorry Controller Status