mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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.
46 lines
1.3 KiB
Text
46 lines
1.3 KiB
Text
// disable code inlining when building static libs
|
|
InlineCode = "no"
|
|
|
|
// include common options
|
|
include "MySQL-Opt.icc"
|
|
include "MySQL-Source.icc"
|
|
|
|
run before sources('..\sql\sql_yacc.yy') targets('..\sql\sql_yacc.c')
|
|
'bison -y -d -o ..\sql\sql_yacc.c ..\sql\sql_yacc.yy'
|
|
|
|
option ProjectOptions = MySQLOptions
|
|
, define( "MYSQL_SERVER", "")
|
|
{
|
|
|
|
option file(genobject, "..\\OBJ\\ZLIB\\")
|
|
{
|
|
target "..\\bin\\mysqld.exe"
|
|
{
|
|
// optimized precompiled headers
|
|
option macros('global', 'yes')
|
|
{
|
|
source type('cpp') server_global_pch
|
|
}
|
|
source type('cpp') server_pch
|
|
|
|
// target source files
|
|
source "rint.obj"
|
|
source zlib, ufc, regex, 'strings\bmove_upp.c'
|
|
if debug_build {
|
|
source type('cpp') dbug
|
|
}
|
|
source type('cpp') heap
|
|
source type('cpp') isam
|
|
source type('cpp') merge
|
|
source type('cpp') myisam
|
|
source type('cpp') myisammrg
|
|
source type('cpp') my_sys
|
|
source type('cpp') my_sys_sql
|
|
source type('cpp') strings
|
|
source type('cpp') sql,
|
|
"..\\myisam\\mi_check.c",
|
|
"..\\myisam\\sort.c"
|
|
source BldLevelInfo
|
|
}
|
|
}
|
|
}
|