Commit graph

20 commits

Author SHA1 Message Date
Marko Mäkelä
be85d3e61b Merge 10.2 into 10.3 2019-05-14 17:18:46 +03:00
Marko Mäkelä
26a14ee130 Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
Vicențiu Ciorbaru
f177f125d4 Merge branch '5.5' into 10.1 2019-05-11 19:15:57 +03:00
Michal Schorm
17b4f99928 Update FSF address
This commit is based on the work of Michal Schorm, rebased on the
earliest MariaDB version.

Th command line used to generate this diff was:

find ./ -type f \
  -exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
  -exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
  -exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \
  -exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \
  -exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \
  -exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
2019-05-10 20:52:00 +03:00
Sergei Golubchik
4e1d3f83b7 Merge branch '10.2' into 10.3 2019-03-29 19:41:41 +01:00
Vladislav Vaintroub
05ad7fc3ed MDEV-19054 : mysql_upgrade_service now allows MySQL 5.7 to MariaDB 10.2 upgrade. 2019-03-28 11:42:21 +01:00
Monty
99a2870905 Simple cleanups
- Add 'stage name' to debug output
2017-11-05 22:23:32 +02:00
iangilfillan
f0ec34002a Correct FSF address 2017-03-10 18:21:29 +01:00
Vladislav Vaintroub
b6e826bac2 MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the installer. Do not lauch upgrade wizard after installation 2016-05-24 23:15:00 +02:00
Igor Babaev
5d954e7cd0 Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
Vladislav Vaintroub
3886fdf009 LP952607: Do not show MySQL services preinstalled by Dell in the upgrade wizard 2012-03-12 12:14:04 +01:00
Sergei Golubchik
5bf311e1e8 fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00
Sergei Golubchik
25609313ff 5.3.4 merge 2012-02-15 18:08:08 +01:00
Sergei Golubchik
a1e3fa93c7 lp:893522 more problems found by PVS Studio 2012-01-12 20:13:22 +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
7ac23980b8 MWL#55 : Philip's review:
Take into account that mysql services start even with 
invalid defaults files (using data file relative to mysqld.exe location).
Handle this case in upgrade scenarios, as if there was no  
--defaults-file in service definition.
2011-02-15 13:04:55 +01:00
Vladislav Vaintroub
577d02b17d MWL#55: look for my.cnf in addition to my.ini trying to figure out defaults file for the service 2011-02-08 13:07:31 +01:00
Vladislav Vaintroub
614a6dfcd4 MWL#55: Handle cases where service was installed with
mysqld --install without any parameters.

In such case, service name is always MYSQL, as service
binary path is "path\to\mysqld.exe" "MySQL". Guess data
directory it is either from my.ini (which  is assumed to
be in the installation root), or just data directory 
under install root.
2011-02-04 12:20:41 +01:00
Vladislav Vaintroub
3cb88652dd MWL#55: correct mysqld.exe file path, to extract version from it.
Take into account that services registered by  MySQL do not have
 .exe extension  in service binary path.
2011-02-03 17:51:03 +01:00
Vladislav Vaintroub
1b28a0883d split long lines, use get_mysql_service_properties() 2011-01-30 22:42:02 +01:00