mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 17:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
197369 commits 2783 branches 343 tags 1.7 GiB
Commit graph

20 commits

Author SHA1 Message Date
Marko Mäkelä
a722ee88f3 Merge 10.5 into 10.6 2021-06-01 11:39:38 +03:00
Otto Kekäläinen
a70a5537e7 Deb: Innotop: Add support for MariaDB 10.5+ 
Synced from downstream Debian:
7015e8e4b5
 2021-05-28 14:04:10 +10:00
Rucha Deodhar
4e19539c14 MDEV-22189: Change error messages inside code to have mariadb instead of 
mysql

Fix: Changed error messages, rerecorded results and changed other relevant
files.
 2021-05-24 11:38:13 +05:30
Marko Mäkelä
4930f9c94b Merge 10.5 into 10.6 2021-04-21 11:45:00 +03:00
Otto Kekäläinen
7a0fa9da03 Deb: Cleanup and document 
- Remove unnecessary unused files
- Remove duplicate encryption configuration sample from sources and
  re-use the identical file in RPM directory instead
- Clean away harmful "default-character-set = utf8mb4" from client config
  as it is unnecassary (server enforces utf8mb4 anyway by default) and
  could cause issues with mysqlbinlog and other tools (MDEV-22981).
- Update S3 plugin description to be long enough
- Remove trailing whitespace from support-files and Debian packaging.
- Clean away fixed Lintian issues
- Clean away temporary Salsa-CI fixes now that 10.5.4 is out and is fixed
- Apply wrap-and-sort -a -v
 2020-07-30 10:36:39 +10:00
Otto Kekäläinen
29c5d96da3 MDEV-21869: Make Debian packaging Lintian clean 
Fix Lintian complaints on:
 P: maintainer-script-without-set-e
 W: mariadb-server-10.5: script-not-executable usr/share/mysql/mysql.init
 W: mariadb-client-10.5: incorrect-path-for-interpreter usr/bin/innotop
    (#!/usr/bin/env perl != /usr/bin/perl)
 2020-04-19 17:15:40 +03:00
Marko Mäkelä
28c89b7151 Merge 10.4 into 10.5 2019-12-16 07:47:17 +02:00
Faustin Lammler
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
Pali
5cc2096f93 Switch Perl DBI scripts from DBD::mysql to DBD::MariaDB driver 
Perl DBD::MariaDB driver is available CPAN and is already used in
production environment.
 2019-07-19 13:39:20 +03:00
Marko Mäkelä
be85d3e61b Merge 10.2 into 10.3 2019-05-14 17:18:46 +03:00
Vicențiu Ciorbaru
f177f125d4 Merge branch '5.5' into 10.1 2019-05-11 19:15:57 +03:00
Vicențiu Ciorbaru
15f1e03d46 Follow-up to changing FSF address 
Some places didn't match the previous rules, making the Floor
address wrong.

Additional sed rules:

sed -i -e 's/Place.*Suite .*, Boston/Street, Fifth Floor, Boston/g'
sed -i -e 's/Suite .*, Boston/Fifth Floor, Boston/g'
 2019-05-11 18:30:45 +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
Otto Kekäläinen
cb1945dd0d MDEV-16666: Partially revert "Deb: Update documentation and fix spelling errors" 
This partially reverts commit 548ec3a088
by removing the misfixed misspellings.
 2018-08-05 17:15:03 +03:00
Otto Kekäläinen
548ec3a088 Deb: Update documentation and fix spelling errors 2018-05-28 11:32:21 +03:00
luz.paz
3dd01669b4 Misc. typos 
Found via `codespell -i 3 -w --skip="./debian/po" -I ../mariadb-server-word-whitelist.txt  ./cmake/ ./debian/ ./Docs/ ./include/ ./man/ ./plugin/ ./strings/`
 2018-04-05 15:26:57 +04:00
iangilfillan
f0ec34002a Correct FSF address 2017-03-10 18:21:29 +01:00
Jean Weisbuch
dbd1d7ea8e Updated innotop on debian/additions from 1.7.1 to 1.11.4 2017-03-07 15:27:21 +04:00
Otto Kekäläinen
1777fd5f55 Fix spelling: occurred, execute, which etc 2016-03-04 02:09:37 +02:00
unknown
cfd4fcb0bc Initial draft for building .deb packages for MariaDB 5.5. 2012-01-23 12:20:16 +01:00