Commit graph

204 commits

Author SHA1 Message Date
Sergei Golubchik
25609313ff 5.3.4 merge 2012-02-15 18:08:08 +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
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
Michael Widenius
a8d03ab235 Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
2011-11-21 19:13:14 +02:00
Sergei Golubchik
0e007344ea mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
Sergei Golubchik
76f0b94bb0 merge with 5.3
sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup
2011-10-19 21:45:18 +02:00
Vladislav Vaintroub
9d0b9ffa50 merge 2011-10-12 12:30:55 +02:00
Vladislav Vaintroub
f1b2ecc437 Add option to enable feedback plugin to the MSI installer. 2011-10-12 12:07:14 +02:00
Sergei Golubchik
ae63300801 merge 2011-10-11 12:55:42 +02:00
Sergei Golubchik
eeca1f8694 merge with 5.1 2011-10-07 00:18:30 +02:00
Sergei Golubchik
630b0b8779 support for plugins on windows
CMakeLists.txt:
  1. add -DSAFEMALLOC -DSAFE_MUTEX in the top-level CMakeLists.txt
     don't force plugins to copy-paste these lines in their CMakeLists.txt
  2.1 search plugin/* for plugins (not only storage/*),
  2.2 recognize MYSQL_PLUGIN (not only MYSQL_STORAGE_ENGINE),
  2.3 extract library names from the plug.in (don't force library names to
      be ha_<engine>.dll and <engine>.lib)
include/mysql/plugin.h:
  define MYSQL_PLUGIN_EXPORT appropriately
  (backport from 5.5)
libmysqld/CMakeLists.txt:
  remove unnecessary workaround
plugin/fulltext/CMakeLists.txt:
  build fulltext example plugin on windows
storage/maria/CMakeLists.txt:
  The library is called libmaria_s.lib, not maria.lib
storage/maria/unittest/CMakeLists.txt:
  The library is called libmaria_s.lib, not maria.lib
storage/myisam/CMakeLists.txt:
  The library is called libmyisam_s.lib, not myisam.lib
storage/mysql_storage_engine.cmake:
  introduce MYSQL_PLUGIN macro.
  don't force library names to be ha_<engine>.dll and <engine>.lib
storage/xtradb/CMakeLists.txt:
  remove a condition from include
win/README:
  don't use deprecated syntax
win/configure-mariadb.sh:
  don't use deprecated syntax
win/configure.js:
  1. support MYSQL_PLUGIN in addition to MYSQL_STORAGE_ENGINE.
  2. support plugin/* in addition to storage/*
2011-10-04 15:41:52 +02:00
Vladislav Vaintroub
999c37bb0f merge 2011-09-16 18:26:20 +02:00
Vladislav Vaintroub
d202a22132 Fix path lookup for singtool 2011-09-16 18:15:04 +02:00
Kent Boortz
027b5f1ed4 Updated/added copyright headers 2011-07-03 17:47:37 +02:00
Sergei Golubchik
9809f05199 5.5-merge 2011-07-02 22:08:51 +02:00
Kent Boortz
68f00a5686 Updated/added copyright headers 2011-06-30 17:37:13 +02:00
Kent Boortz
44135d4725 Updated/added copyright headers 2011-06-30 17:31:31 +02:00
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
Kent Boortz
02e07e3b51 Updated/added copyright headers 2011-06-30 17:46:53 +02:00
Vladislav Vaintroub
11411f5b6c Cygwin-specific klugde to workaround missing TEMP/TMP variables. 2011-05-10 18:00:28 +02:00
Michael Widenius
e415ba0fb2 Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
2011-05-02 20:58:45 +03: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
Georgi Kodinov
4ed8cb4a76 Added support for VS10.
Fixed RelWithDebugInfo bzr ignores.
2011-03-28 13:43:30 +03: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