1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-17 12:02:09 +03:00
Commit Graph

42 Commits

Author SHA1 Message Date
55bb933a88 Merge branch 10.4 into 10.5 2021-12-26 12:51:04 +01:00
681b7784b6 Merge branch 10.3 into 10.4 2021-12-25 12:13:03 +01:00
3376668ca8 Merge branch 10.2 into 10.3 2021-12-23 14:14:04 +01:00
f13c2107b3 Don't beep in mysql_upgrade_service.exe
This beep looks especially strange, as mysqladmin output is redirected to
the log file
2021-12-07 17:46:29 +01:00
d4cb177603 Merge 10.4 into 10.5 2021-11-29 11:16:20 +02:00
4da2273876 Merge 10.3 into 10.4 2021-11-29 10:59:22 +02:00
289721de9a Merge 10.2 into 10.3 2021-11-29 10:33:06 +02:00
81d7adb1e2 MDEV-27075 mysql_upgrade_service.exe - using uninitialized memory 'defaults_file'
Remove section that was trying to rename default-character-set to character-set-server

This seems to be an old workaround for some upgrade warning, which did not
work for some time already, because the ini filename was not initialized.
2021-11-18 00:55:09 +01:00
064cb58efe Merge 10.4 into 10.5
FIXME: Part of the MDEV-20699 test is disabled due to
nonderterministic result.
2021-09-30 09:04:43 +03:00
a10b63bf58 Merge 10.3 into 10.4 2021-09-29 16:03:02 +03:00
a1352870a2 MDEV-26717 mysql_upgrade_service/mariadb-upgrade-service -avoid slow shutdown
Apparently, slow shutdown is not necessary anymore after MDEV-15912 fix
2021-09-29 12:29:17 +02:00
5d6ad2ad66 Added 'const' to arguments in get_one_option and find_typeset()
One should not change the program arguments!
This change also reduces warnings from the icc compiler.

Almost all changes are just syntax changes (adding const to
'get_one_option function' declarations).

Other changes:
- Added a few cast of 'argument' from 'const char*' to 'char *'. This
  was mainly in calls to 'external' functions we don't have control of.
- Ensure that all reset of 'password command line argument' are similar.
  (In almost all cases it was just adding a comment and a cast)
- In mysqlbinlog.cc and mysqld.cc there was a few cases that changed
  the command line argument. These places where changed to instead allocate
  the option in a MEM_ROOT to avoid changing the argument. Some of this
  code was changed to ensure that different programs did parsing the
  same way. Added a test case for the changes in mysqlbinlog.cc
- Changed a few variables that took their value from command line options
  from 'char *' to 'const char *'.
2021-02-08 12:16:29 +02:00
28c89b7151 Merge 10.4 into 10.5 2019-12-16 07:47:17 +02:00
a15234bf4b Merge branch '10.3' into 10.4 2019-12-09 15:09:41 +01:00
2df2238cb8 Lintian complains on spelling error
The lintian check complains on spelling error:
https://salsa.debian.org/mariadb-team/mariadb-10.3/-/jobs/95739
2019-12-02 12:41:13 +02:00
a9846f3299 Merge 10.4 into 10.5 2019-11-19 10:45:28 +08:00
009674dc52 Fix a couple of clang-cl warnings 2019-11-15 15:39:31 +01:00
f217612fad MDEV-12684 Show what config file a sysvar got a value from
change get_one_option() prototype to pass the filename and
not to pass the redundant optid.
2019-10-14 10:29:30 +02:00
bd917e0811 Fix clang-cl warnings 2019-07-04 10:27:10 +02:00
c07325f932 Merge branch '10.3' into 10.4 2019-05-19 20:55:37 +02:00
be85d3e61b Merge 10.2 into 10.3 2019-05-14 17:18:46 +03:00
c51f85f882 Merge branch '10.2' into 10.3 2019-05-12 17:20:23 +02:00
f177f125d4 Merge branch '5.5' into 10.1 2019-05-11 19:15:57 +03:00
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
d0ee3b5500 MDEV-19427 mysql_upgrade_service throws exception upgrading from 10.0 to 10.3
The crash happens when writing into log file.
The reason is likely that the call to WriteFile() was missing a valid
parameter for lpNumberOfBytesWritten. This seems only to happen on ancient
version of Windows.

Since the fix to MDEV-16430 in 141bc58ac9, null pointer was passed
instead of valid pointer.

The fix is to provide a valid lpNumberOfBytesWritten parameter.
2019-05-09 17:41:37 +02:00
5c0730e0ce Fix clang-cl format warning 2018-12-12 22:51:20 +01:00
a93ac8d95f MDEV-16448 mysql_upgrade_service remove my.ini variables that are no more valid
MDEV-16447 incorporate Innodb slow shutdown into mysql_upgrade_service.exe
2018-11-15 18:03:30 +01:00
36e59752e7 Merge branch '10.2' into 10.3 2018-06-30 16:39:20 +02:00
aa59ecec89 Merge branch '10.0' into 10.1 2018-06-12 18:55:27 +03:00
5bfd562a00 MDEV-16445 mysql_upgrade_service should add skip-slave-start to server start parameters 2018-06-08 20:42:25 +01:00
141bc58ac9 MDEV-16430: mysql_upgrade_service does not write log file.
Fixed  CreateFile() for the log file
- TRUNCATE_EXISTING does not create a new file, use CREATE_ALWAYS
- Make log file handle inheritable
2018-06-08 19:52:30 +01:00
56e7b7eaed Make possible to use clang on Windows (clang-cl)
-DWITH_ASAN can be used as well now, on x64

Fix many clang-cl warnings.
2018-02-20 21:17:36 +00:00
4aaa38d26e Enusure that my_global.h is included first
- Added sql/mariadb.h file that should be included first by files in sql
  directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables
  that must be done before my_global.h is included)
- Removed a lot of include my_global.h from include files
- Removed include's of some files that my_global.h automatically includes
- Removed duplicated include's of my_sys.h
- Replaced include my_config.h with my_global.h
2017-08-24 01:05:44 +02:00
f0ec34002a Correct FSF address 2017-03-10 18:21:29 +01:00
f4ae8b7691 - Properly terminate options array with all-zero entry.
- Fix CRLF end of lines, use LF instead
2011-05-20 01:38:42 +02:00
d4a3a7b90e mwl#59 - windows installer.
Address Monty's review comments
2011-03-09 20:21:03 +01:00
47c776bc4c MWL#55: mysql_upgrade_service.exe will now ensure that datadir is always written to my.ini file 2011-02-08 12:05:16 +01:00
0e3921a8fe Remove --loose-skip-pbxt kludge from mysql_install_db
and mysql_upgrade_service, after LPBUG#688404 was 
fixed.
2011-02-04 19:51:23 +01:00
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
d99fbf4867 MWL#55 : Add banner text to command line utilities
(Philip's review)
2011-02-03 18:56:30 +01:00
366ee3c791 Move common functionality (analyze service configuration) into winservice library 2011-01-30 22:27:59 +01:00
2bc6032c99 MWL#55 - mysql_upgrade_service.exe
New utility to upgrade Windows service to higher MariaDB version.
Its functionality includes changing service definition as well as
running mysql_upgrade.
2011-01-29 19:00:05 +01:00