Commit graph

171059 commits

Author SHA1 Message Date
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
Vladislav Vaintroub
ae7b39a13a Merge branch '5.5' into 10.0 2015-12-30 20:55:12 +01:00
Vladislav Vaintroub
ff24820269 Fix process handle leak in buildbot. GenerateConsoleCtrlEvent sent to non-existing process will add a process handle to this non-existing process to console host process conhost.exe 2015-12-30 20:52:42 +01:00
Alexander Barkov
4d3bc26152 Merge remote-tracking branch 'origin/5.5' into 10.0 2015-12-29 18:41:37 +04:00
Alexander Barkov
61d3621ea3 Moving Field_blob::store_length() back from protected to public,
as it's needed for Cassandra in 10.0.
2015-12-29 18:40:41 +04:00
Alexander Barkov
7529870c7e Merge branch '10.0' of github.com:MariaDB/server into 10.0 2015-12-29 15:19:29 +04:00
Alexander Barkov
6d7362eeb8 Merge remote-tracking branch 'origin/5.5' into 10.0 2015-12-29 15:18:55 +04:00
Sergey Vojtovich
f31a89191f MDEV-9128 - Compiling on IBM System Z fails
Provided IBM System Z have outdated compiler version, which supports gcc sync
builtins but not gcc atomic builtins. It also has weak memory model.

InnoDB attempted to verify if __sync_lock_test_and_set() is available by
checking IB_STRONG_MEMORY_MODEL. This macro has nothing to do with availability
of __sync_lock_test_and_set(), the right one is HAVE_ATOMIC_BUILTINS.
2015-12-29 14:24:53 +04:00
Sergey Vojtovich
93b078cc85 MDEV-9128 - Compiling on IBM System Z fails
Provided IBM System Z have outdated compiler version, which supports gcc sync
builtins but not gcc atomic builtins. It also has weak memory model.

InnoDB attempted to verify if __sync_lock_test_and_set() is available by
checking IB_STRONG_MEMORY_MODEL. This macro has nothing to do with availability
of __sync_lock_test_and_set(), the right one is HAVE_ATOMIC_BUILTINS.
2015-12-29 14:24:46 +04:00
Alexander Barkov
e1b9be5417 MDEV-9319 ALTER from a bigger to a smaller blob type truncates too much data 2015-12-29 14:17:31 +04:00
Sergei Golubchik
4fdf25afa8 after-merge: 10.0 part of MDEV-9249 (ERR_remove_state) 2015-12-21 16:37:59 +01:00
Sergei Golubchik
05dc86c09f Merge branch '5.5' into 10.0 2015-12-21 16:36:10 +01:00
Sergei Golubchik
e126baafbc MDEV-9249 MariaDB un-buildable on linux64: fails @ "error: ‘ERR_remove_state’ was not declared in this scope" when linking against OpenSSL 1.0.2e
ERR_remove_state is deprecated, use ERR_remove_thread_state
if possible
2015-12-21 12:17:31 +01:00
Sergei Golubchik
865548fc8d MDEV-9088 Server crashes on shutdown after the second post of feedback report
On shutdown feedback was sending a short report without creating
a THD. At that point current_thd was pointing to the already
destroyed THD from the previous full report.

backport from 10.1:
  commit bfe703a
  Author: Sergei Golubchik <serg@mariadb.org>
  Date:   Tue Feb 3 18:19:56 2015 +0100

      don't let current_thd to point to a destroyed THD
2015-12-19 13:36:21 +01:00
DevilSatan
591e74c7e8 MDEV-7526: TokuDB doesn't build on OS X
A string definition is inconsistent and thus causes a compilation error.

Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
2015-12-19 14:14:16 +02:00
Vicențiu Ciorbaru
e386523a41 MDEV-7526: TokuDB doesn't build on OS X
Fixed compile warning related to if statement always being true. The if
statement can not be false, as the address of a member field is always
true.
2015-12-19 14:14:16 +02:00
Vicențiu Ciorbaru
f39b9e04db MDEV-7526: TokuDB doesn't build on OS X
Removed unused functions from tokudb_dump.cc.
2015-12-19 14:14:16 +02:00
Vicențiu Ciorbaru
64149590c4 MDEV-7526: TokuDB doesn't build on OS X
This patch fixes another compilation error caused by specifying
attribute nonnull for all the parameters of the copyout function. This
is incorrect as the function actually gets called with null parameters
indirectly and thus only the output parameter should be nonnull.
2015-12-19 14:14:10 +02:00
Vicențiu Ciorbaru
f89c9fc4b7 MDEV-7526: TokuDB doesn't build on OS X
This patch fixes one compilation error related to __db_lsn struct. The
struct can not be defined as empty according to the main C standard.
In C++, this is handled by forcing a size of 1. To eliminate the error
we add a dummy char field of size 1. This has no effect on the C++
compiled code, but also removes the compiler error.
2015-12-19 14:14:05 +02:00
Daniel Black
3b9423fda2 MDEV-7384: Add --persistent option for mysqlcheck
10.0 has an "analyze table .. persistent for all" syntax. This adds
--persistent to mysqlcheck(mysqlanalyize) to perform this extended
analyze table option.

Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
2015-12-18 21:59:47 +02:00
Sergey Vojtovich
5efb8f1677 Filter out unix-socket from unrelated test cases 2015-12-18 22:51:12 +04:00
Sergey Vojtovich
3402f7a853 Fixed auth_socket static compilation 2015-12-18 16:31:05 +04:00
Sergey Vojtovich
90ea014585 MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in many
of the plugins

Removed exit() from daemon_example, pass error to caller instead.
Also removed unused my_abort_hook.
2015-12-16 19:39:00 +04:00
Oleksandr Byelkin
71eee693b2 MDEV-9167: COLUMN_CHECK fails on valid decimal data
Check now allows zero length decimals too.

(backporting Adam Chainz patch to 10.0)
2015-12-16 11:09:54 +01:00
Sergei Golubchik
bd69d7b3f3 after-merge disable unstable tests
they used to be unstable, fixed in 7.1.8
and apparently broken again now
2015-12-16 08:58:49 +01:00
Sergei Golubchik
a70f700a03 after merge fix debian builds 2015-12-15 23:34:32 +01:00
Sergei Golubchik
2116649dee after-merge fix replication tests
* mostly update result files
* also updating test/include files to match 5.6
2015-12-15 20:25:06 +01:00
Sergei Golubchik
7a21364332 after-merge fix partitioning tests
* use --sort_result in test files as needed
* remove old and wrong mariadb-5.3 related partitioning hack
   from ha_tokudb.cc
2015-12-15 20:25:04 +01:00
Sergei Golubchik
15f7f5c6bb Merge branch 'merge-tokudb-5.6' into 10.0 2015-12-15 20:13:09 +01:00
Oleksandr Byelkin
a75ac82c2f MDEV-9147: Character set is ignored in Dynamic Column for saved string
Fixed moving charset from definition to the value.
2015-12-15 14:08:29 +01:00
Jan Lindström
98c9fbfa21 MDEV-8297: information_schema.innodb_sys_tablestats.modified_counter doesn't change on UPDATE
Update modified-counter also if update effects non-indexed columns.
2015-12-15 11:29:15 +02:00
Alexander Barkov
e9b4a041af MDEV-8721 AIX: Compile error xtradb:log0log.cc 2015-12-15 11:59:37 +04:00
Jan Lindström
b63bf7368b MDEV-8923: port innodb_buffer_pool_dump_pct from MySQL
Backport pull request #125 from grooverdan/MDEV-8923_innodb_buffer_pool_dump_pct to 10.0

WL#6504 InnoDB buffer pool dump/load enchantments

This patch consists of two parts:

    1. Dump only the hottest N% of the buffer pool(s)
    2. Prevent hogging the server duing BP load

From MySQL - commit b409342c43ce2edb68807100a77001367c7e6b8e

Add testcases for innodb_buffer_pool_dump_pct_basic.

Part of the code authored by Daniel Black
2015-12-15 09:35:22 +02:00
Alexander Barkov
af3c67056d MDEV-9265 SuSE patches: Suspicious implicit sign extension 2015-12-15 10:57:28 +04:00
Jan Lindström
99404c3437 MDEV-9276: MySQL Bug #78754: FK definitions missing from SHOW CREATE TABLE in "innodb_read_only" mode 2015-12-14 22:10:37 +02:00
Vladislav Vaintroub
0db50be893 Fix logic around retrying failed Windows async IO as synchronous IO . os_file_write/read macros were wrong (had wrong number of args), among other things 2015-12-14 17:06:08 +01:00
Vladislav Vaintroub
f0da062818 fix compile error on Windows 2015-12-14 17:02:42 +01:00
Sergei Golubchik
3e206a518d Merge branch 'kentoku/10.0' into 10.0 2015-12-13 23:55:20 +01:00
Sergei Golubchik
6b4cc43f17 Merge branch 'connect/10.0' into 10.0 2015-12-13 23:52:43 +01:00
Olivier Bertrand
92326bf8ac Merge branch 'ob-10.0' into 10.0 2015-12-13 18:41:17 +01:00
Olivier Bertrand
8286b680b2 - Copy error message from G to g when using temporary storage for parsing.
modified:   storage/connect/tabjson.cpp
2015-12-13 18:39:32 +01:00
Sergei Golubchik
b418e97826 Merge branch 'merge/merge-perfschema-5.6' into 10.0 2015-12-13 17:19:18 +01:00
Sergei Golubchik
095b7b92d1 Merge branch 'merge/merge-pcre' into 10.0 2015-12-13 16:25:57 +01:00
Sergei Golubchik
359ae59ac0 Merge branch 'merge/merge-xtradb-5.6' into 10.0 2015-12-13 16:23:02 +01:00
Sergei Golubchik
5b3c100788 Merge branch 'merge/merge-innodb-5.6' into 10.0 2015-12-13 10:18:42 +01:00
Sergei Golubchik
6bb292f1bc 5.6.28 2015-12-13 10:15:55 +01:00
Sergei Golubchik
e7591a1ba9 8.38 2015-12-13 10:14:29 +01:00
Sergei Golubchik
1e270d504d 5.6.27-76.0 2015-12-13 10:13:18 +01:00
Sergei Golubchik
e9eaaa4b4a 5.6.28 2015-12-13 10:11:49 +01:00
Sergei Golubchik
1623995158 Merge branch '5.5' into 10.0 2015-12-13 00:10:40 +01:00