Vladislav Vaintroub
67cf76ad9b
MDEV 4691- address review comments
2016-01-19 11:59:32 +01:00
Sergei Golubchik
e3d37bfebf
Merge branch 'connect/10.1' into 10.1
2015-11-19 18:09:06 +01:00
Vladislav Vaintroub
f1daf9ced4
MDEV-9024 Build fails with VS2015
...
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)
2015-11-06 17:27:24 +01:00
Sergei Golubchik
cfeedbfd3e
Merge branch '5.5' into 10.0
2015-10-09 17:12:26 +02:00
Sergei Golubchik
16c4b3c68b
fixes for buildbot:
...
* OSX (mysqlimport freeing unallocated memory)
* Windows (didn't compile MSI)
* fulltest2 (innodb crashes in --embedded --big)
2015-10-09 16:43:59 +02:00
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
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
