mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
4765ab612c
Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts Fixed error messages. Fixed problem with const propagation when comparing columns of different types BitKeeper/deleted/.del-.cvsignore~a91d63182f0b2366: Delete: sql/share/norwegian/.cvsignore BitKeeper/deleted/.del-.cvsignore~469064b5190d703d: Delete: sql/share/norwegian-ny/.cvsignore Docs/manual.texi: Changelog client/client_priv.h: Update for OS2 client/mysqldump.c: Update for OS2 include/mysqld_error.h: Updated error texts isam/create.c: Removed warning myisam/myisamchk.c: Fix for OS2 myisam/myisampack.c: Fix for OS2 mysys/mf_cache.c: Fix for OS2 mysys/mf_tempfile.c: Fix for OS2 mysys/my_os2file64.c: Fix for OS2 mysys/my_tempnam.c: Fix for OS2 os2/ChangeLog.os2: Fix for OS2 os2/MySQL-Client.icc: Fix for OS2 os2/MySQL-Opt.icc: Fix for OS2 os2/MySQL-Source.icc: Fix for OS2 os2/MySQL-Sql.icc: Fix for OS2 os2/MySQL-Util.icc: Fix for OS2 sql/mysqld.cc: Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts. This avoids some problems when users spefices wrong arguments to mysqld. sql/nt_servc.cc: C sql/share/czech/errmsg.txt: Updated error texts sql/share/danish/errmsg.txt: Updated error texts sql/share/dutch/errmsg.txt: Updated error texts sql/share/english/errmsg.txt: Updated error texts sql/share/estonian/errmsg.txt: Updated error texts sql/share/french/errmsg.txt: Updated error texts sql/share/german/errmsg.txt: Updated error texts sql/share/greek/errmsg.txt: Updated error texts sql/share/hungarian/errmsg.txt: Updated error texts sql/share/italian/errmsg.txt: Updated error texts sql/share/japanese/errmsg.txt: Updated error texts sql/share/korean/errmsg.txt: Updated error texts sql/share/norwegian-ny/errmsg.txt: Updated error texts sql/share/norwegian/errmsg.txt: Updated error texts sql/share/polish/errmsg.txt: Updated error texts sql/share/portuguese/errmsg.txt: Updated error texts sql/share/romanian/errmsg.txt: Updated error texts sql/share/russian/errmsg.txt: Updated error texts sql/share/slovak/errmsg.txt: Updated error texts sql/share/spanish/errmsg.txt: Updated error texts sql/share/swedish/errmsg.txt: Updated error texts sql/share/ukrainian/errmsg.txt: Updated error texts sql/sql_select.cc: Fixed problem with const propagation when comparing columns of different types. Fixed bug when HEAP table is converted to MyISAM tables in GROUP BY on long strings.
121 lines
3 KiB
Text
121 lines
3 KiB
Text
// disable code inlining when building static libs
|
|
InlineCode = "no"
|
|
|
|
// include common options
|
|
include "MySQL-Opt.icc"
|
|
include "MySQL-Source.icc"
|
|
|
|
option ProjectOptions = MySQLOptions
|
|
{
|
|
|
|
option file(genobject, "..\\OBJ\\ZLIB\\")
|
|
{
|
|
target "..\\bin\\mysql.dll"
|
|
{
|
|
// optimized precompiled headers
|
|
option macros('global', 'yes')
|
|
{
|
|
source type('cpp') client_global_pch
|
|
}
|
|
// target source files
|
|
source zlib
|
|
if debug_build {
|
|
source type('cpp') dbug
|
|
}
|
|
source type('cpp') my_sys
|
|
source type('cpp') my_sys_cli
|
|
source type('cpp') strings
|
|
source type('cpp') mysqlclientlib
|
|
source type('cpp') '..\libmysql\dll.c'
|
|
source BldLevelInfo
|
|
}
|
|
}
|
|
|
|
option file(genobject, "..\\OBJ\\READLINE\\")
|
|
{
|
|
target "..\\bin\\mysql.exe"
|
|
{
|
|
// optimized precompiled headers
|
|
option macros('global', 'yes')
|
|
{
|
|
source type('cpp') client_global_pch
|
|
}
|
|
// target source files
|
|
source type('cpp') "..\\client\\mysql.cc"
|
|
source BldLevelInfo
|
|
}
|
|
}
|
|
|
|
option file(genobject, "..\\OBJ\\READLINE\\")
|
|
{
|
|
target "..\\bin\\mysqladmin.exe"
|
|
{
|
|
// optimized precompiled headers
|
|
option macros('global', 'yes')
|
|
{
|
|
source type('cpp') client_global_pch
|
|
}
|
|
// target source files
|
|
source type('cpp') "..\\client\\mysqladmin.c"
|
|
source BldLevelInfo
|
|
}
|
|
}
|
|
|
|
target "..\\bin\\mysqldump.exe"
|
|
{
|
|
// optimized precompiled headers
|
|
option macros('global', 'yes')
|
|
{
|
|
source type('cpp') client_global_pch
|
|
}
|
|
// target source files
|
|
source type('cpp') "..\\client\\mysqldump.c"
|
|
source BldLevelInfo
|
|
}
|
|
|
|
target "..\\bin\\mysqlshow.exe"
|
|
{
|
|
// target source files
|
|
source type('cpp') "..\\client\\mysqlshow.c"
|
|
source BldLevelInfo
|
|
}
|
|
|
|
target "..\\bin\\mysqlimport.exe"
|
|
{
|
|
// target source files
|
|
source type('cpp') "..\\client\\mysqlimport.c"
|
|
source BldLevelInfo
|
|
}
|
|
|
|
target "..\\bin\\mysqltest.exe"
|
|
{
|
|
source type('cpp') "..\\client\\mysqltest.c"
|
|
source BldLevelInfo
|
|
}
|
|
|
|
target "..\\bin\\mysqlbinlog.exe"
|
|
{
|
|
// optimized precompiled headers
|
|
option macros('global', 'yes')
|
|
{
|
|
source type('cpp') client_global_pch
|
|
}
|
|
// target source files
|
|
source type('cpp') "..\\client\\mysqlbinlog.cc"
|
|
source BldLevelInfo
|
|
}
|
|
|
|
target "..\\bin\\mysqlcheck.exe"
|
|
{
|
|
// optimized precompiled headers
|
|
option macros('global', 'yes')
|
|
{
|
|
source type('cpp') client_global_pch
|
|
}
|
|
|
|
// target source files
|
|
source type('cpp') "..\\client\\mysqlcheck.c"
|
|
source BldLevelInfo
|
|
}
|
|
|
|
}
|