Commit graph

160 commits

Author SHA1 Message Date
Vladislav Vaintroub
4058115cf7 LPBUG#779758 - fix missing alpha/beta etc in MSI and ZIP package names. 2011-06-17 23:00:26 +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
Vladislav Vaintroub
7aba87b72f Workaround a cmake bug that was only visible on a newly installed Philip's 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.
2011-05-27 18:57:40 +02:00
Vladislav Vaintroub
11411f5b6c Cygwin-specific klugde to workaround missing TEMP/TMP variables. 2011-05-10 18:00:28 +02:00
Vladislav Vaintroub
2a60cc126d enable 'Optimized for transactions'configuration checkbox if innodb is compiled in 2011-04-08 02:49:04 +02:00
Vladislav Vaintroub
c0577f6798 Add optional CMake parameter TINY_VERSION.
Parameter setting has the effect on 4th part of the version string in executable's version info on Windows.
It could be set e.g to bzr revno to uniquely identify  different builds for the same major.minor.patch combo.
2011-03-29 19:01:42 +02:00
Vladislav Vaintroub
90b5afaab6 Sign MSI if code signing is requested.
Remove SIGNCODE_ENABLED variable from create_msi.cmake.in,
it was already removed from other places.
2011-03-28 12:56:34 +02:00
Vladislav Vaintroub
22a8654a6f CMake fixes for buildbot/MSI package building and signing:
- 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.
2011-03-28 01:05:34 +02:00
Vladislav Vaintroub
41d432462b merge 5.2 2011-03-10 09:39:14 +01:00
Vladislav Vaintroub
1754c7da96 pass WITH_ARIA_STORAGE_ENGINE to configure.js 2011-03-07 15:10:32 +01:00
Michael Widenius
3358cdd504 Merge with 5.1 to get in changes from MySQL 5.1.55 2011-02-28 19:39:30 +02:00
Michael Widenius
58bb0769bd Merge with MySQL 5.1.55
- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria

Now need to merge with latest xtradb before pushing 

sql/ha_partition.cc:
  Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
  Changed to use opt_stack_trace instead of opt_pstack.
  Removed references to pstack
sql/partition_element.h:
  Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
  Fixed wrong assert
2011-02-20 18:51:43 +02:00
Vladislav Vaintroub
3ec6533ac8 MWL#55 : address Philip's final review comments :
- rename upgrade_wizard.exe to mysql_upgrade_wizard.exe
- have shortcut to upgrade wizard in the menu folder
2011-02-14 19:36:06 +01:00
Vladislav Vaintroub
e3b05c79c6 MWL#55 : Adjust UI according to some user's expectations.
If upgradable instances are found, bring a new dialog  to inform user about it. This gives user a
chance to deselect "database instance" feature early,  because experience shows nobody really looks at features and their in their description  in "customize setup" dialog. This also tells  user 
that existing instances can  be upgraded.
2011-02-07 17:12:35 +01:00
Vladislav Vaintroub
edf9757cb8 MWL#55 :
Allow MSI and  NSIS side-by-side installation if  installed NSIS package
differs in  "major.minor" version numbers. Still disallow MSI and NSIS 
if major.minor versions  of both packages match.
2011-02-04 12:16:23 +01:00
Vladislav Vaintroub
074dc9a550 On Philips request, introduce a variable
BUILD_RELEASE to disable graceful fallbacks
if WiX or MFC is not available.
2011-02-03 21:02:20 +01:00
Vladislav Vaintroub
57d477c7cf MWL#55 : force per-machine installation.
Problem: user without privileges can have an half-complete
installation, if he manages to click on "Ignore" for all  errors
in the installer. 

As a result, he will miss ARP registry keys, and uninstall 
will not be possible using  "Add/Remove Programs" applet.
2011-02-03 16:05:21 +01:00
Vladislav Vaintroub
550823b533 AssignProcessToJobObject cannot assign current process
on Win7 with the most strict user account control setting 
(secure desktop)

Fix: use job object for child process only, not for current
process itself.
2011-02-02 01:34:22 +01:00
Vladislav Vaintroub
bb982477a4 add some forgotten jpgs 2011-01-30 23:40:56 +01:00
Vladislav Vaintroub
dd8fc3810d add forgotten files generated by VS MFC project 2011-01-30 23:20:02 +01:00
Vladislav Vaintroub
1b28a0883d split long lines, use get_mysql_service_properties() 2011-01-30 22:42:02 +01:00
Vladislav Vaintroub
366ee3c791 Move common functionality (analyze service configuration) into winservice library 2011-01-30 22:27:59 +01:00
Vladislav Vaintroub
e353bc80f7 MWL#55 : implement MSI installer
The  general technique to generate MSI using CMake is taken from MySQL 5.5

Additional features not present in 5.5 installer : 
-optionally creating a new database
(as Windows service), using new mysql_install_db.exe to do the job
 
- optional upgrade of existing services from old MySQL or Maria installation.
This work is actually done by the upgrade wizard that is launched at the 
end of installation.
2011-01-29 19:06:50 +01:00
Vladislav Vaintroub
e15f914813 MWL#55 : implement upgrade_wizard - GUI program
to uzpgrade existing MySQL/Maria services to higher version.

To be used in installer (but also can be used outside of installer too)
2011-01-29 19:02:43 +01:00
Vladislav Vaintroub
b19e99865c MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order
to be able to build MSI based installer
2011-01-29 18:51:12 +01:00
Kent Boortz
4acfdb9df1 Merge 2010-12-29 00:47:05 +01:00
Kent Boortz
85323eda8a - Added/updated copyright headers
- Removed files specific to compiling on OS/2
- Removed files specific to SCO Unix packaging
- Removed "libmysqld/copyright", text is included in documentation
- Removed LaTeX headers for NDB Doxygen documentation
- Removed obsolete NDB files
- Removed "mkisofs" binaries
- Removed the "cvs2cl.pl" script
- Changed a few GPL texts to use "program" instead of "library"
2010-12-28 19:57:23 +01:00
Vladislav Vaintroub
8b4b8c8e65 merge 2010-12-02 16:19:28 +01:00
Vladislav Vaintroub
c87923dc2d Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings
-  Remove all mentioning of /MAP /MAPINFO link options (does not work in VS2010).
     Remove map files from packaging.
  -  Fix warning about ETIMEDOUT being redefined.
  -  Fix  warning about FSP_EXTENT_SIZE in xtradb  (32/64 bit right shift mismatch)
  -  Silence warnings coming from  generated  code (flex/bison) in xtradb/innodb_plugin.
  -  Be nice to people without cygwin (me) and add win/configure-mariadb.bat with options suitable for quick compilation, e.g no embedded
2010-12-01 21:37:03 +01:00
Georgi Kodinov
05c9acaaf7 Bug #50021: Windows standard configuration files are showing Linux
options/settings
 
 1. Changed the default value for socket on Windows to the windows
 default
 2. Removed hard-coded trailing slashes from innodb_data_home_dir
 and innodb_log_group_name_dir.
 3. Added extra backslashes to the innodb directory example
 4. Made the tempdir platform "dependent"
 5. Fixed the comments in the .ini files
 6. Removed the tmpdir from the templates and the scripts
2010-11-18 18:02:37 +02:00
Sergei Golubchik
b56086cbbb build mysqld.exe with federatedx not federated 2010-10-20 09:17:17 +02:00
Sergei Golubchik
f3aeafe348 build windows binaries with federatedx, not federated. 2010-09-20 18:46:15 +02:00
Sergei Golubchik
e246077bcf rename maria to aria 2010-09-12 18:40:01 +02:00
Sergei Golubchik
a3d80d952d merge with 5.1 2010-09-11 20:43:48 +02:00
Michael Widenius
ad6d95d3cb Merge with MySQL 5.1.50
- Changed to still use bcmp() in certain cases becasue
  - Faster for short unaligneed strings than memcmp()
  - Bettern when using valgrind
- Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems
- Changed code to use MariaDB version of select->skip_record()
- Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
2010-08-27 17:12:44 +03:00
unknown
2be1a25faa Automerge MariaDB 5.1->5.2. 2010-07-09 13:39:19 +02:00
Bo Thorsen
ee45ab0694 Add 64 bit packages to the pack script. 32 bit is still the default 2010-07-07 13:30:33 +02:00
Bo Thorsen
ccdbcaeb57 Install MariaDB as a service with the installer 2010-06-30 14:10:40 +02:00
Hakan Kuecuekyilmaz
4ee9e66d87 Make MariaDB compile with VS 2010
Most of the changes are backports from MySQL 5.5. Please note
that the 64-bit build fails with VS 2010 and the 32-bit build
has problems running mysql-test-run.pl.
      
* Added files for compiling with VS 2010 and added them
to Makefile.am.
* ifdef'ed ETIMEDOUT, because it is defined by VS 2010 now
* Removed not needed /MAP's from cmake files
2010-06-24 22:40:30 +02:00
Bo Thorsen
e6eab96555 Fix short version number 2010-05-26 10:40:01 +02:00
Bo Thorsen
d7f201ac74 Fix a couple of problems in the pack script, and disable a check feature that doesn't work right now 2010-05-25 16:56:35 +02:00
Bo Thorsen
febb68f5ae Add a -nobuild argument to the script. Useful for building the zip file release with Express Edition which doesn't have the devenv command 2010-05-14 14:12:23 +02:00
unknown
4bf849c23c Merge MySQL 5.1.44 into MariaDB. 2010-03-04 09:03:07 +01:00
Kent Boortz
0a90bfe6c0 Adjuster the parsing of "configure.in" version number line 2010-02-03 14:52:11 +01:00
Sergey Petrunya
182aa542bc Dummy change to push the release tag. 2009-10-30 13:50:48 +03:00
Sergey Petrunya
9f3a7c30e2 Cosmetic fixes to win/make_mariadb_win_dist 2009-10-12 20:50:20 +04:00