Commit graph

799 commits

Author SHA1 Message Date
Sergei Golubchik
244f0e6dd8 Merge branch '10.3' into 10.4 2019-09-06 11:53:10 +02:00
Monty
a071e0e029 Merge branch '10.2' into 10.3 2019-09-03 13:17:32 +03:00
Monty
2d85714448 Updated BUILD/SETUP from MariaDB 10.5 2019-09-01 19:17:34 +03:00
Marko Mäkelä
1d15a28e52 Merge 10.3 into 10.4 2019-08-14 18:06:51 +03:00
Marko Mäkelä
65d48b4a7b Merge 10.2 to 10.3 2019-08-13 19:28:51 +03:00
Monty
6168f41401 Updated BUILD/compile-pentium64-asan-max 2019-08-08 23:08:22 +03:00
Marko Mäkelä
02979daab4 Merge 10.3 into 10.4 2019-06-19 10:49:00 +03:00
Michael Widenius
86faa98bd7 Removed -fno-rtti from BUILD scripts 2019-06-16 13:31:42 +03:00
Oleksandr Byelkin
c07325f932 Merge branch '10.3' into 10.4 2019-05-19 20:55:37 +02:00
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
cb248f8806 Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
Vicențiu Ciorbaru
5543b75550 Update FSF Address
* Update wrong zip-code
2019-05-11 21:29:06 +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
hygonsoc
6f3b09993f add Hygon Dhyana support in check-cpu
Signed-off-by: hygonsoc <hygonsoc@gmail.com>
2019-05-10 21:56:39 +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
Monty
e3bffd579f Removed some warnings from -Wimplicit-fallthrough= with build scripts 2019-04-01 19:47:24 +03:00
Monty
4eae9eeccc Backport BUILD scripts from 10.4
- Fixes building with galera and tokudb
- Added support for --without-wsrep BUILD script option
2019-02-06 22:18:20 +02:00
Monty
84c0563a27 Fixed BUILD scripts to by default work with galera and tokudb
Bascially this means that all builds with BUILD scripts are done with
--with-jemalloc=NO      # Required by tokudb
--with-ssl              # Required on OpenSuse 10.5 to get galera to work
2018-12-09 20:49:05 +02:00
Monty
3b64663287 Updated check-cpu from 10.3 to get it to work with gcc 7.3.1 2018-11-16 14:19:58 +02:00
Michael Widenius
0f7022c6f3 Renamed compile-pentium scripts to compile-pentium32
This is to align the naming to compile-pentium64 and to
avoid mistakes of accidently compiling a 32 bit binary on
a 64 bit system

Removed also a few very old not usable BUILD scripts
2018-04-16 20:16:43 +03:00
Michael Widenius
ddc5764303 Remove compiler warnings
- Remove unused variables
- Mark variables unused
- Fix wrong types
- Add no-strict-aliasing to BUILD scripts
2018-04-16 20:16:43 +03:00
Monty
84514ec643 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
	sql/table.cc
2018-01-27 15:20:01 +02:00
Monty
8ff5ddae23 Disable rocksdb when building with ASAN
I disabled rocksdb in ASAN build as I got a link error when
it's included
2018-01-27 14:39:33 +02:00
Monty
27a5d96bcb Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
	sql/sp_rcontext.cc
2018-01-21 20:32:48 +02:00
Monty
cc915cd599 Fixed some build scripts to work with gprof and gcov 2018-01-18 15:20:30 +02:00
Marko Mäkelä
bec2712775 Merge 10.2 into bb-10.2-ext 2018-01-13 18:18:28 +02:00
Monty
09ef28abd7 Fixed BUILD scripts
- Removed extra set -x -v used for debugging
- Fixed that that gcc version tests works for gcc 7
2018-01-13 16:38:43 +02:00
Marko Mäkelä
cca611d1c0 Merge 10.2 into bb-10.2-ext 2018-01-11 18:00:31 +02:00
Monty
bf7719111f Removed duplicated copyright message 2018-01-11 17:09:51 +02:00
Monty
ec97aba284 Fixed BUILD scripts
- Skip 'clean' if not a git repository
  (Good for tar files)
- Add configuration for ASAN builds
2018-01-10 19:36:38 +02:00
Alexander Barkov
5c0df0e4a8 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-04 15:31:25 +04:00
Monty
3833097463 Clean up BUILD script
- Removed some not old, not used build scipts
- Removed tokudb and rocksdb from 32 bit builds
  This enables one now to easily build 32 bit binaries
  on 64 bit systems
2017-07-01 14:26:42 +03:00
Monty
f99b83571a Added submodule updates to BUILD scripts 2017-06-30 22:33:28 +03:00
Monty
267bd4cc7b Add automatic updating of sub modules to BUILD scripts 2017-05-29 16:40:24 +03:00
Michael Widenius
1fbf1c6d7c Build MyRocks as a plugin (as static compilation doesn't work) 2017-05-11 17:08:40 +03:00
Monty
1bcbe6fc2b Fixed build scripts to compile MyRocks as a plugin 2017-05-02 19:19:23 +03:00
Sergei Golubchik
da4d71d10d Merge branch '10.1' into 10.2 2017-03-30 12:48:42 +02:00
iangilfillan
f0ec34002a Correct FSF address 2017-03-10 18:21:29 +01:00
Monty
bf95970ec0 Cleanups
* Ensure that BUILD scripts cleans up things properly before new BUILD
* MySQL -> MariaDB
* Ignore wrong valgrind memleak
2017-01-11 09:19:45 +02:00
Monty
7567cf5aef Fixes for using ssl with BUILD scripts.
Needed as GNUTLS can't be used by MariaDB on many systems,
like OpenSuse 13.2
2017-01-11 09:18:36 +02:00
Monty
67034b6d52 Fixes for running with gcov 2017-01-11 09:18:35 +02:00
Sergei Golubchik
f9bdc7c01a Merge branch '10.2' into bb-10.2-jan 2016-09-19 09:47:08 +02:00
Sergei Golubchik
06b7fce9f2 Merge branch '10.1' into 10.2 2016-09-09 08:33:08 +02:00
Jan Lindström
2e814d4702 Merge InnoDB 5.7 from mysql-5.7.9.
Contains also

MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7

	The failure happened because 5.7 has changed the signature of
	the bool handler::primary_key_is_clustered() const
	virtual function ("const" was added). InnoDB was using the old
	signature which caused the function not to be used.

MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7

	Fixed mutexing problem on lock_trx_handle_wait. Note that
	rpl_parallel and rpl_optimistic_parallel tests still
	fail.

MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan)
  Reason: incorrect merge

MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan)
  Reason: incorrect merge
2016-09-02 13:22:28 +03:00
Alexander Kuleshov
080ac47661 remove die() from BUILD/autorun.sh
This patch removes die() function from the BUILD/autorun.sh. It was
introduced in the c682570431 commit (Fix BUILD/autorun.sh to really bail
out on error.). Last users of die() was removed in the 8664de22 commit
(WL#5665: Removal of the autotools-based build system) and since it is
not used anywhere.

No functionality changes. Just cleanup.
2016-08-25 15:56:53 +06:00
Monty
b2f8d7b410 Merge branch '10.1' into 10.2
Conflicts:
	VERSION
	cmake/plugin.cmake
	config.h.cmake
	configure.cmake
	plugin/server_audit/server_audit.c
	sql/sql_yacc.yy
2016-02-06 18:14:54 +02:00
Sergei Golubchik
f4faac4d6a Merge branch '10.0' into 10.1 2016-01-25 22:58:57 +01:00
Monty
4b4777ab63 Backported fix for ccache
Fixed compiler warnings
Added --big-test to tokudb change_column_char & change_column_bin
2016-01-03 12:48:55 +02:00