mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
177386 commits 2784 branches 343 tags 1.6 GiB
Commit graph

46 commits

Author SHA1 Message Date
Sergei Golubchik
44f6f44593 Merge branch '10.0' into 10.1 2018-10-30 15:10:01 +01:00
Sergei Golubchik
37ab7e4596 Merge branch '5.5' into 10.0 2018-10-27 20:46:38 +02:00
Sergei Golubchik
f9e5195b40 Merge branch 'mysql/5.5' into 5.5 2018-10-23 15:59:24 +02:00
Vicențiu Ciorbaru
6e55236c0a Merge branch '10.0-galera' into 10.1 2018-06-12 19:39:37 +03:00
Vicențiu Ciorbaru
aa59ecec89 Merge branch '10.0' into 10.1 2018-06-12 18:55:27 +03:00
Vicențiu Ciorbaru
3ead951180 Merge branch '5.5' into 10.0 2018-06-10 17:16:27 +03:00
Teodor Mircea Ionita
0e6d6354bf Also ignore macOS .DS_Store Finder junk. 2018-06-10 10:13:32 +03:00
Teodor Mircea Ionita
814a284f22 Ignore .cbp QtCreator && CodeBlocks project files 2018-06-10 10:13:32 +03:00
Jan Lindström
648cf7176c Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera 2018-05-07 13:49:14 +03:00
Sachin Setiya
e8a2a75121 MDEV-11036 Add link wsrep_sst_rsync_wan -> wsrep_sst_rsync 
Currently galera has capability of using delta transfer algorithm (rsync)
for SST. But for using delta transfer we have change/copy wsrep_sst_rsync
wsrep_sst_rsync_wan. This patch creates a symbolic link of
wsrep_sst_rsync_wan to wsrep_sst_rsync.
 2017-06-20 14:29:25 +05:30
Sergei Golubchik
f21dcd9933 .gitignore mariabackup 2017-04-27 19:12:43 +02:00
Vladislav Vaintroub
d894f7ceed update gitignore with commonly used (by me) out-of-source builddir names 2017-04-27 19:12:41 +02:00
Sergei Golubchik
31896aa6e2 put all aws_key_management plugin files into plugin/aws_key_management 
that is, download AWS SDK there, not into the builddir root.
and .gitignore them all.
 2017-03-31 18:17:53 +02:00
Vicențiu Ciorbaru
1acfa942ed Merge branch '5.5' into 10.0 2017-03-03 01:37:54 +02:00
Sergei Golubchik
713d513624 MDEV-12074 selinux build failure on Fedora 24 2017-02-27 12:35:10 +01:00
Vicențiu Ciorbaru
1e192e901c Post merge review fixes 
* Remove duplicate lines from tests
* Use thd instead of current_thd
* Remove extra wsrep_binlog_format_names
* Correctly merge union patch from 5.5 wrt duplicate rows.
* Correctly merge SELinux changes into 10.1
 2017-01-17 04:16:38 +02:00
Vicențiu Ciorbaru
8e15768731 Merge branch '10.0' into 10.1 2017-01-16 03:18:14 +02:00
Vicențiu Ciorbaru
1c5ca7c183 Merge branch '5.5' into 10.0 2017-01-12 03:37:13 +02:00
Sergei Golubchik
c1a23cd4e5 MDEV-11676 Starting service with mysqld_safe_helper fails in SELINUX "enforcing" mode 
compile, and install selinux policy for mysqld_safe_helper on centos6.
the policy was created as described in https://mariadb.com/kb/en/mariadb/what-to-do-if-mariadb-doesnt-start/#other-selinux-changes
 2017-01-11 11:55:11 +01:00
vicentiu
e9aed131ea Merge remote-tracking branch 'origin/5.5' into 10.0 2017-01-06 17:09:59 +02:00
Sergei Golubchik
8fcdd6b0ec Numerous issues in mysqld_safe 2016-12-22 12:25:10 +01:00
Olivier Bertrand
0dae2932f4 - New version of the java JdbcInterface 
modified:   storage/connect/JdbcInterface.class
  modified:   storage/connect/JdbcInterface.java

- Ignore *.tlog and .res files
  modified:   .gitignore
 2016-05-23 15:08:51 +02:00
Monty
7c6cb41b15 Ignore files in tmp (like mysqld.S) 2016-04-28 13:39:55 +03:00
Sergei Golubchik
a5679af1b1 Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
Sergei Golubchik
271fed4106 Merge branch '5.5' into 10.0 2016-02-15 22:50:59 +01:00
Sergei Golubchik
95740bc5c5 dtrace in cmake 
1. ignore generated dtrace files
2. don't rewrite probes_mysql_nodtrace.h in-place
 2016-02-15 12:51:35 +01:00
Alexey Botchkov
da0991c6da MDEV-7875 Duplicate maria_add_gis_sp script in the sources. 
Now both are generated by the cmake from the
        scripts/maria_add_gis_sp.sql.in
 2016-01-25 11:32:19 +04:00
Sergei Golubchik
a2bcee626d Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
Sergei Golubchik
15f7f5c6bb Merge branch 'merge-tokudb-5.6' into 10.0 2015-12-15 20:13:09 +01:00
Michael Widenius
0bf2b1c13a Ignore tokudb tool 2015-10-22 15:59:10 +03:00
Daniel Black
20c2ae39db MDEV-427/MDEV-5713 Add systemd script with notify functionality 2015-10-12 17:51:49 +02:00
Sergei Golubchik
0785b2d55d Merge 'https://github.com/Buggynours/MariaDB 10.0' into 10.0 2015-08-03 17:10:20 +02:00
Olivier Bertrand
f07359349f Fix loosing result lines when all of this is true: 
The table type is MYSQL
  The query where clause includes an indexed column
  The where clause contains < or <= operator on this column
Change version date
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/tabmysql.cpp

Add visual studio 2013 files to ignore
  modified:   .gitignore
 2015-07-06 12:33:11 +02:00
Sergei Golubchik
569d2f8154 Merge branch 'connect-10.0' into 10.0 2015-06-16 23:57:49 +02:00
Sergei Golubchik
810cf362ea Merge branch '5.5' into 10.0 2015-06-11 20:20:35 +02:00
Olivier Bertrand
a8b7b6c85b Commit merge resolved files 2015-06-05 10:59:15 +02:00
Sergei Golubchik
7b05650c7d Merge tag 'tokudb-engine/tokudb-7.5.7' into 5.5 2015-06-03 20:24:51 +02:00
Olivier Bertrand
e6b60ee5af Make BIN table files more flexible with new column format. 
In particular enable to set length and endian setting.
This should solve all problems on IBM390s machines.
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/tabfix.cpp
  modified:   storage/connect/tabfix.h

Make DBF tables to be usable in big-endian machines (test version)
  modified:   storage/connect/filamdbf.cpp

Ignore git files on storage/connect
  modified:   .gitignore
 2015-05-13 19:58:21 +02:00
Olivier Bertrand
3b3f6cac8a Typo to check buildbot 2015-05-10 12:17:30 +02:00
Sergei Golubchik
1d3ea9ecd8 perfschema 5.6.24 
including the big commit
  commit 305130361bf72726de220f3d2b2787395e10be61
  Author: Marc Alff <marc.alff@oracle.com>
  Date:   Tue Feb 10 11:31:32 2015 +0100

      WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6

(with the following commits) and related changes in sql/
 2015-05-05 15:23:47 +02:00
Sergei Golubchik
dd0207bda4 .gitignore: add generated mroonga *.result files 
and remove duplicates
 2015-05-05 08:53:52 +02:00
Olivier Bertrand
57aaccef52 - Adding files to ignore from C C++ and Visual Studio 
- Making result files to be ended by LF to avoid test failures
 2015-03-16 17:37:00 +01:00
Sergei Golubchik
63108dc9d2 Fix the tree to work in git. Backport corresponing 10.1 changes. 2015-02-10 12:26:21 +01:00
Jon Olav Hauglid
0fc7b50cdb Create .gitignore as a copy of .bzrignore 2014-10-06 12:54:53 +02:00
Yoni Fogel
bfa1555e9b Add local cache option to make.mysql.debug.env.bash 2013-05-29 09:34:21 -07:00
Yoni Fogel
c72a7b75d5 Import .gitignore 2013-04-17 00:09:27 -04:00