Olivier Bertrand
9c6405fefa
Commit resolved conflicts
2015-09-18 18:39:08 +02:00
Sergei Golubchik
530a6e7481
Merge branch '10.0' into 10.1
...
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
2015-09-03 12:58:41 +02:00
Sergei Golubchik
9cb8cff312
MDEV-8296 MSVS 2013 & WiX 3.9
...
Support for VS2013 and WiX 3.9
(patch by Andrey Kuznetsov)
2015-08-01 17:48:41 +02:00
Sergei Golubchik
658992699b
Merge tag 'mariadb-10.0.20' into 10.1
2015-06-27 20:35:26 +02:00
Sergei Golubchik
810cf362ea
Merge branch '5.5' into 10.0
2015-06-11 20:20:35 +02:00
Olivier Bertrand
1c756512b0
Commit win and CONNECT resolved files
2015-06-05 23:54:19 +02:00
Olivier Bertrand
5d038d3734
commit win/ changes
2015-06-05 23:33:23 +02:00
Vicentiu Ciorbaru
ab54f5a8b9
Fix win/ files to be stored with LF in repository
...
On Windows, the files get checked out with CRLF thanks
to .gitattributes.
2015-05-08 17:31:54 +03:00
Vicentiu Ciorbaru
373d092b3a
Fix win/ files to be stored with LF in repository
...
On Windows, the files get checked out with CRLF thanks
to .gitattributes.
2015-05-08 17:19:48 +03:00
Vicentiu Ciorbaru
0880284bf7
Fix win/ files to be stored with LF in repository
...
On Windows, the files get checked out with CRLF thanks
to .gitattributes.
2015-05-08 17:06:35 +03:00
Sergei Golubchik
b5c5f3176a
convert files from CRLF to LF line endings
2015-05-08 11:48:16 +02:00
Sergei Golubchik
2db62f686e
Merge branch '10.0' into 10.1
2015-03-07 13:21:02 +01:00
Sergei Golubchik
d7e7862364
Merge branch '5.5' into 10.0
2015-02-18 15:16:27 +01:00
Sergei Golubchik
d996dc2997
MDEV-7290 please update MSI installer to include HeidiSQL 9.1
2015-02-11 15:02:15 +01:00
Sergei Golubchik
01963e5df1
fix for cmake builds on windows
2015-02-10 10:21:16 +01:00
Sergei Golubchik
dfc7e9541d
MDEV-7531 Update 10.0.15 to 10.0.16 -> Error 2003 (HY000) can't connect to MySql server.
...
use the old registry branch, even if we changed the "manufacturer" string
2015-01-30 15:53:24 +01:00
Nirbhay Choubey
def5bd67ba
MDEV-6891: Update company name
2014-12-12 10:40:27 -05:00
Nirbhay Choubey
4ba6ee1b31
MDEV-6891: Update company name
2014-12-12 10:38:19 -05:00
Sergei Golubchik
e27c338634
5.5.38 merge
2014-06-06 00:07:27 +02:00
Sergei Golubchik
8bdda78c82
MDEV-6271 update MSI installer to include latest Version of HeidiSQL (8.3.x.x)
2014-05-27 21:05:44 +02:00
Sergei Golubchik
72ba95873a
10.0-base merge
...
(without InnoDB - all InnoDB changes were ignored)
2013-06-06 21:32:29 +02:00
Vladislav Vaintroub
db7085dfae
remove start menu shortcut to upgrade wizard
2013-05-19 17:42:30 +02:00
Vladislav Vaintroub
b67ec975dc
MDEV-4544 : Update MSI installer to use latest HeidiSQL 8.0
2013-05-19 17:41:22 +02:00
Vladislav Vaintroub
55b3c84492
Small mysql_install_db.exe fixes
...
- 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.
2013-05-09 22:21:07 +02:00
Vladislav Vaintroub
8d75f11a67
MDEV-4458 - Windows installer does not launch upgrade wizard anymore, even 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.
2013-04-30 00:29:47 +02:00
Vladislav Vaintroub
0b034c1b2c
Fix to handle CMake component names with dash in the name, when producing MSI package.
...
Rename connect_engine component back to connect-engine.
2013-04-19 18:45:54 +02:00
Vladislav Vaintroub
4a3e22c430
Fix MSI package creation for connect engine.
...
Also, do not use /MP option when compiling CONNECT (incompatible with COM #import directive)
Also, fix ODBC_LIBRARY to be a list on Windows, not string with spaces inside.
2013-04-17 07:44:49 -07:00
Vladislav Vaintroub
6e7e3f80ee
MDEV-3993 - add MSI installer option to set character-set-server=utf8
2013-01-01 15:33:25 +01:00
Sergei Golubchik
9a64d0794c
5.3 merge
2012-08-27 18:13:17 +02:00
Vladislav Vaintroub
f024e0d5e9
MDEV-484 : allow compilation/packaging on Windows with newly released VS2012
2012-08-24 15:30:05 +02:00
Vladislav Vaintroub
afedd72e22
MSI package: always install new component "Common" (currently consists of charset directory)
2012-05-30 20:20:54 +02:00
Sergei Golubchik
867ce618cb
merge
2012-05-05 14:59:44 +02:00
Sergei Golubchik
44cf9ee5f7
5.3 merge
2012-05-04 07:16:38 +02:00
Vladislav Vaintroub
e3ffaed147
support same version upgrade for MSI
2012-05-04 03:51:30 +02:00
Vladislav Vaintroub
feb4776ecf
MDEV233 - Support Wix3.6 for MSI
2012-04-25 15:30:19 +02:00
Vladislav Vaintroub
e13e93cb0b
merge
2012-04-17 01:03:10 +02:00
Vladislav Vaintroub
5af60b5ed4
fix compiler warnings
2012-04-16 23:31:33 +02:00
Vladislav Vaintroub
4da30b3e3d
MDEV-221 - Properly escape command line when starting mysql_install_db
...
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.
2012-04-16 15:28:33 +02:00
Vladislav Vaintroub
f18514df2e
Add minimal clarication about 'root' user to the installer UI
2012-04-15 01:21:18 +02:00
Igor Babaev
5d954e7cd0
Merge 5.3->5.5
2012-03-17 01:26:58 -07:00
Vladislav Vaintroub
be8cd3e8df
LP947631: Uninstall wipes HeidiSQL settings, even if HeidiSQL is installed 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.
2012-03-06 01:46:32 +01:00
Vladislav Vaintroub
0c265a5eb8
Use newly released HeidiSQL 7.0 in the MSI installer
2012-02-12 23:02:56 +01:00
Sergei Golubchik
25609313ff
5.3.4 merge
2012-02-15 18:08:08 +01:00
Vladislav Vaintroub
64e308e28d
Fix build and packaging on Windows:
...
- 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
2011-11-26 23:07:53 +01:00
Vladislav Vaintroub
f1b2ecc437
Add option to enable feedback plugin to the MSI installer.
2011-10-12 12:07:14 +02:00
Vladislav Vaintroub
824ce5f3ea
After talking to HeidiSQL people - libmysql.dll that comes with their 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)
2011-06-09 00:24:27 +02:00
Vladislav Vaintroub
c0f2f1f1f6
Fix a problem building MSI using localized (Spanish) Visual Studio 2010.
...
VS did not like to execute 2 commands in custom build step, workaround is
to use single COMMAND instead of 2.
2011-06-08 16:56:35 +02:00
Vladislav Vaintroub
37f464f3a2
use our libmysql.dll with HeidiSQL, if we compile 32 bit
2011-06-02 10:06:51 +02:00
Vladislav Vaintroub
58c6165e28
Use our libmysql.dll with Heidi, if we compile 32 bit
2011-06-01 21:14:10 +02:00
Vladislav Vaintroub
02dabe3597
MWL#200 - provide options to install 3rd party components.
...
Added HeidiSQL as example, i.e cmake -DWITH_THIRD_PARTY=HeidiSQL
and building MSI will bundle HeidiSQL.
2011-06-01 15:52:52 +02:00
