Skip to content

Commit af44187

Browse files
author
[email protected]
committed
Merge with 4.0 to get fixes for Windows project files
2 parents f23af5e + 0babddf commit af44187

56 files changed

Lines changed: 354 additions & 118 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BUILD/compile-pentium-valgrind-max‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
path=`dirname $0`
44
. "$path/SETUP.sh"
55

6-
extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify"
6+
extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
77
c_warnings="$c_warnings $debug_extra_warnings"
88
cxx_warnings="$cxx_warnings $debug_extra_warnings"
99
extra_configs="$pentium_configs $debug_configs"

‎VC++Files/bdb/bdb.dsp‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/client/mysql.dsp‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/client/mysqladmin.dsp‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/client/mysqldump.dsp‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/client/mysqlimport.dsp‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/client/mysqlshow.dsp‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/copy_mysql_files.bat‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ REM stop any conflicting service
22

33
net stop mysql
44

5-
REM Our build system uses M:\mysql-version for the build root dir
6-
7-
M:
8-
cd \mysql-4.0
9-
10-
REM Copy binaries
5+
REM Copy binaries to c:\mysql
6+
REM (We assume we are in build root when executing this script)
117

128
copy lib_debug\libmysql.* c:\mysql\lib\debug
139
copy lib_debug\zlib.* c:\mysql\lib\debug

‎VC++Files/innobase/innobase.dsp‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/isamchk/isamchk.dsp‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)