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
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
Sergei Golubchik
ab83952f29
10.0-base merge
2013-01-31 09:48:19 +01:00
Sergei Golubchik
aca8e7ed6b
5.3 merge
2013-01-15 19:07:46 +01:00
Igor Babaev
1ef07d0845
Merge 10.0-base -> 10.0.
...
Also fixed a bug in sql_update.cc: the code of mysql_update() lacked
a call of set_statistics_for_table().
2013-01-10 22:33:23 -08:00
Sergei Golubchik
4f67a14700
5.2->5.3 merge
2013-01-10 15:40:21 +01:00
Vladislav Vaintroub
6e7e3f80ee
MDEV-3993 - add MSI installer option to set character-set-server=utf8
2013-01-01 15:33:25 +01:00
Vladislav Vaintroub
3c987667d9
merge
2012-12-21 15:19:08 +01:00
Vladislav Vaintroub
7885b38cbb
Support VS2012. Exclude compiler-defined symbols from being exported by mysqld.exe
2012-12-21 15:17:26 +01:00
Vladislav Vaintroub
dbb8d954fd
Trigger pusbuild build
2012-11-11 10:58:52 +01:00
Sergei Golubchik
9a64d0794c
5.3 merge
2012-08-27 18:13:17 +02:00
unknown
f090677383
Merge from 5.2.
2012-08-24 15:39:34 +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
6920491587
merge
2012-05-02 17:04:28 +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
2004bd1736
merge
2012-04-16 23:35:38 +02:00
Vladislav Vaintroub
5af60b5ed4
fix compiler warnings
2012-04-16 23:31:33 +02:00
Vladislav Vaintroub
6d22c2e73a
merge
2012-04-16 17:41:43 +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
unknown
5338a28912
Merge 5.2->5.3
2012-03-14 13:58:18 +02: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
e2deff6f02
merge
2012-02-12 23:03:36 +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
Igor Babaev
7b79d8a33f
Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.
2012-02-01 15:48:02 -08:00
Vladislav Vaintroub
e022fd8bf8
MDEV-33 : removed unused files in win/
2012-01-10 01:11:36 +01:00
Vladislav Vaintroub
22876a5495
MDEV-50 : Fix default compilation comment
2012-01-10 19:26:47 +01:00
Michael Widenius
6d4224a31c
Merge with 5.2.
...
no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
2011-12-11 11:34:44 +02: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
Michael Widenius
6920457142
Merge with MariaDB 5.1
2011-11-24 18:48:58 +02:00
Sergei Golubchik
d2755a2c9c
5.3->5.5 merge
2011-11-22 18:04:38 +01:00
