| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
candle.exe's preprocessor flags (-dHaveUpgradeWizard=0 -DHaveInnodb=1)
were not passed correctly to EXECUTE_PROCESS
Fix is to make a list out of the EXTRA_WIX_PREPROCESSOR_FLAGS string,
and use the preprocessor flags list in EXECUTE_PROCESS.
|
| |
|
|
|
|
| |
Fix WinUIDialogBmp.jpg to use correct dimensions
|
|
|
|
| |
Use new grey logo.
|
| |
|
|
|
|
|
|
|
|
| |
LocalSystem)
Skip permission for data directory for LogonUser, if installation
runs by one of the service accounts (determined from their well-known SID).
There is no real LogonUser in this case.
|
| |
|
|
|
|
| |
randomly generated name in UAC prompt
|
|
|
|
|
| |
"C:\Program Files (x86)" directory needs to be checked as well in
this case.
|
| |
|
|
|
|
| |
supported)
|
| |
|
|
|
|
|
| |
This appears to break some installation, and it did not do anything
useful anyway.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
cherry-pick f1daf9ce from 10.0 branch
-------------------------------------
Fix build failures caused by new C runtime library
- isnan, snprintf, struct timespec are now defined, attempt to
redefine them leads
- P_tmpdir, tzname are no more defined
- lfind() and lsearch() in lf_hash.c had to be renamed, declaration
conflicts with some C runtime functions with the same name declared in
a header included by stdlib.h
Also fix couple of annoying warnings :
- remove #define NOMINMAX from config.h to avoid "redefined" compiler
warnings(NOMINMAX is already in compile flags)
- disable incremental linker in Debug as well (feature not used much
and compiler crashes often)
Also simplify package building with Wix, require Wix 3.9 or later
(VS2015 is not compatible with old Wix 3.5/3.6)
|
|
|
|
|
|
| |
* OSX (mysqlimport freeing unallocated memory)
* Windows (didn't compile MSI)
* fulltest2 (innodb crashes in --embedded --big)
|
|
|
|
|
| |
On Windows, the files get checked out with CRLF thanks
to .gitattributes.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
- Use lc-messages-dir instead of deprecated --language when running mysqld in bootstrap mode.
- Add some verbosity to mysql_install_db.exe when it runs in course of MSI installation.
|
|
|
|
|
|
|
| |
if there are upgradable instances (i.e windows service of lower MariaDB/MySQL version)
The main reason for he error is misplaced ADD_DIRECTORY in top-level CMakeLists.txt.
ADD_DIRECTORY(win/packaging) was places before win/upgrade_wizard, and MSI was not able to detect that upgrade wizard was built, and thus excluded upgrade wizard entirely.
|
| |
|
|\ |
|
| | |
|
| |
| |
| |
| | |
charset directory)
|
|\ \ |
|
| |\ \
| | |/ |
|
| | | |
|
|/ / |
|
|\ \
| |/ |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
since password characters can contain quotes or spaces.
The proper quoting method for command line arguments used here was extracted from
http://blogs.msdn.com/b/twistylittlepassagesallalike/archive/2011/04/23/everyone-quotes-arguments-the-wrong-way.aspx
Additionally, mysql_install_db.exe now passes root password to "mysqld.exe --bootstrap"
in hexadecimal form, to handle potential special chars inside password string literal.
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
prior to MariaDB
Fixed detection of installed HeidiSQL in the machine, prevent installing own copy if HeidiSQL is already installed.
On deinstallation, do not remove settings if official HeidiSQL is detected.
|
|\ \
| |/ |
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- build executables we have in 5.3 (mysql_install_db.exe, mysq_upgrade_service.exe, upgrade wizard), and MSI
- add some missing headers to windows specific source files.
This needs to be done since 5.5 is using WIN32_LEAN_AND_MEAN preprocessor constant thus windows.h
no more includes whiole Windows
- do not deliver perl scripts (mysql_install_db.pl & friends) -they do not work, are not documented, and we
have native executables for this functionality. do not pack echo.exe, replace.exe into MSI, they
are not needed. Do not build resolveip on Windows, it is not used.
- precache results of of system checks in cmake/os/WindowsCache.cmake (like it is alreay done for majority of tests
to speed up cmake run with VS)
- make feedback plugin DEFAULT on Windows (so MSI works if user enables plugin),
fix null pointer access in PSI_register
|
| |
|
|
|
|
|
|
| |
distribution in place, dont replace with our own.
It also will result in less HeidiSQL restarts during MariaDB upgrades (since libmysql.dll won't be replaced)
|
|
|
|
|
| |
VS did not like to execute 2 commands in custom build step, workaround is
to use single COMMAND instead of 2.
|
| |
|
| |
|
|
|
|
|
| |
Added HeidiSQL as example, i.e cmake -DWITH_THIRD_PARTY=HeidiSQL
and building MSI will bundle HeidiSQL.
|
|
|
|
|
|
|
|
|
|
| |
machine.
CMake 2.8.4 crashed on this line
IF(something AND IS_DIRECTORY(something_else))
when both "something" and "something_else" were empty.
Changing the line slightly (using cascading "IF" instead) solved the crash.
|
|
|
|
| |
compiled in
|
|
|
|
|
| |
Remove SIGNCODE_ENABLED variable from create_msi.cmake.in,
it was already removed from other places.
|
|
|
|
|
|
|
|
|
|
|
| |
- FIND_PROGRAM (signtool) will now get a hint about location of signtool.exe (Windows SDK)
- Targets "package" or "msi" will now fail, l if signing is requested but does not work
(e.g invalid certificate)
- During install, do not re-sign binaries, if they are already signed.
- Preserve mysqld_error.h timestamp whenever possible. This helps avoiding situations
where the whole server is rebuilt, whenever comp_err.exe changes (for example after code
signing, or also after a minor fix in mysys)
- Fix Wix error in UpgradeVersion, if patch part of the version is 0.
|