Commit graph

17382 commits

Author SHA1 Message Date
Jan Lindström
3e98383787 Fix test failures seen on buildbot. 2015-10-30 08:39:05 +02:00
Sergei Golubchik
937aa7ad77 MDEV-9010 Encryption preset file contains different configuration preset then documentation
* clarify the comment in the preset file
* make boolean --aria-encrypt-tables option to work without an argument
2015-10-29 10:46:37 +01:00
Sergei Golubchik
239e0c571e MDEV-8551 compilation fails with 10.1.6
Restore changes that were lost in a merge. Originally from

commit 66fd45a
Author: Sergei Golubchik <serg@mariadb.org>
Date:   Mon Jun 8 21:06:56 2015 +0200

    MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4
2015-10-29 10:46:37 +01:00
Jan Lindström
0fe5eb5cae MDEV-9032: MariaDB 10.1.8 crashes at startup
Add diagnostics when externally stored field is freed but
rollback ctx is not what we expect.
2015-10-29 08:21:28 +02:00
Kentoku SHIBA
14eea2f8c2 merge spider-3.2.37 2015-10-29 07:34:53 +09:00
Jan Lindström
f2ab9abbd6 MDEV-9000: storage/xtradb/fil/fil0pagecompress.cc fails to compile on i686-linux
Incorrect parameter type was used. Fixed by casting data types to correct
ones.
2015-10-28 09:14:22 +02:00
Jan Lindström
4834d822ef MDEV-8932: innodb buffer pool hit rate is less than zero
In buffer pool read hit rate calculation can lead rate that is
less than zero.
2015-10-28 08:42:51 +02:00
Sergei Golubchik
a9b5a8d505 Merge branch 'bb-10.0-serg' into 10.0 2015-10-28 00:08:18 +01:00
Sergei Golubchik
3c5733cd2d Merge branch 'connect/10.0' into 10.0 2015-10-27 18:57:28 +01:00
Jan Lindström
13884cf206 MDEV-8696: Adding indexes on empty table is slow with large innodb_sort_buffer_size.
Analysis: Current implementation will write and read at least one block
(sort_buffer_size bytes) from disk / index even if that block does not
contain any records.

Fix: Avoid writing / reading empty blocks to temporary files (disk).
2015-10-27 13:00:15 +02:00
Sergei Golubchik
2c8c652978 5.6.26-74.0 2015-10-26 12:57:57 +01:00
Olivier Bertrand
e7fa7e0858 Fix error and warnings raised by gcc on Linux:
Define O_RDONLY in jsonudf.cpp
 Correct wrong deinit function names
 Make Locate functions use the variable more
 Avoid signed/unsigned warning in ha_connect.cc GetIntegerTableOption
 Initialize oom in tabodbc MakeInsert
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/tabodbc.cpp
2015-10-25 21:19:45 +01:00
Olivier Bertrand
abe87bb011 Fix error and warnings raised by gcc on Linux:
Define O_RDONLY in jsonudf.cpp
 Correct wrong deinit function names
 Make Locate functions use the variable more
 Avoid signed/unsigned warning in ha_connect.cc GetIntegerTableOption
 Initialize oom in tabodbc MakeInsert
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/tabodbc.cpp
2015-10-25 21:11:04 +01:00
Buggynours
de19721296 Fix of error and warnings when compiling on linux
modifié :         storage/connect/ha_connect.cc
	modifié :         storage/connect/jsonudf.cpp
	nouveau fichier : storage/connect/mysql-test/connect/r/odbc_firebird.result
	modifié :         storage/connect/mysql-test/connect/t/json.test
	nouveau fichier : storage/connect/mysql-test/connect/t/odbc_firebird.test
	modifié :         storage/connect/tabodbc.cpp
	supprimé :        storage/connect/Makefile
2015-10-25 17:46:20 +01:00
Sergei Golubchik
84da1547e6 MDEV-8883 more cross-compiling fixes
use CHECK_C_SOURCE_COMPILES for atomic tests if cross-compiling
(continue to use CHECK_C_SOURCE_RUNS otherwise)
2015-10-24 19:58:34 +02:00
Sergei Golubchik
fb8713385f remove unneded #include's that had a dubious explanation 2015-10-24 19:58:34 +02:00
Alexander Barkov
2c0bcfff8c MDEV-8693 Tests connect.bin connect.endian fail on armhf (on Debian build system) 2015-10-24 20:16:06 +04:00
Sergei Golubchik
df8832caae MDEV-8883 more cross-compiling fixes
don't abort with "XtraDB not supported" if XtraDB was disabled
in this build.
2015-10-22 15:23:18 +02:00
Sergei Golubchik
581d85259d MDEV-8868 Consider adding a check for libjemalloc version in cmake and/or at runtime
add a run-time check for jemalloc >= 2.3
2015-10-22 13:55:55 +02:00
Olivier Bertrand
41a3c58e28 Merge branch 'ob-10.0' into 10.0 2015-10-21 19:40:38 +02:00
Olivier Bertrand
1816eca57c Fix MDEV-8882
modified:   storage/connect/tabodbc.cpp
2015-10-21 19:26:35 +02:00
Olivier Bertrand
b35f9972c8 Fix MDEV-8882
modified:   storage/connect/tabodbc.cpp
2015-10-21 19:24:01 +02:00
Jan Lindström
17b0b45b1d Code cleanup. 2015-10-21 09:20:54 +03:00
Olivier Bertrand
2445b1b212 Typo 2015-10-20 18:49:33 +02:00
Olivier Bertrand
ac9141cbc0 Merge branch 'ob-10.0' into 10.0 2015-10-20 18:45:45 +02:00
Olivier Bertrand
d51e466e63 Fix MDEV-8966
modified:   storage/connect/ha_connect.cc
2015-10-20 13:20:10 +02:00
Jan Lindström
f3e362464b MDEV-8869: Potential lock_sys->mutex deadlock
Analysis: We are alreading holing lock_sys mutex when we call thd::awake.
This could lead mutex deadlock if trx->current_lock_mutex_owner is not
correctly set.

Fix: Make sure that trx->current_lock_mutex_owner is correctly set.
2015-10-20 13:41:14 +03:00
Olivier Bertrand
7cd9af694f Fix MDEV-8926
modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mysql-test/connect/r/datest.result
  modified:   storage/connect/mysql-test/connect/t/datest.test
2015-10-18 16:04:25 +02:00
Olivier Bertrand
f5154229ed Merge branch 'ob-10.0' into 10.0 2015-10-18 15:06:14 +02:00
Olivier Bertrand
90209463d0 Fix MDEV-8926
modified:   storage/connect/ha_connect.cc
2015-10-18 15:03:45 +02:00
Olivier Bertrand
100be0b6ee Update JSON UDFs to version 1.04.0004
modified:   storage/connect/json.cpp
  modified:   storage/connect/json.h
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/mysql-test/connect/r/json_udf.result
  modified:   storage/connect/mysql-test/connect/std_data/biblio.json
  modified:   storage/connect/mysql-test/connect/t/json_udf.inc
  modified:   storage/connect/mysql-test/connect/t/json_udf.test
  modified:   storage/connect/tabjson.cpp
2015-10-17 17:23:11 +02:00
Sergey Vojtovich
6346d1de2f MDEV-427/MDEV-5713 Add systemd script with notify functionality
After review/QA fixes.
2015-10-12 17:51:49 +02:00
Daniel Black
20c2ae39db MDEV-427/MDEV-5713 Add systemd script with notify functionality 2015-10-12 17:51:49 +02:00
Sergei Golubchik
dfb74dea30 Merge branch '10.0' into 10.1 2015-10-12 00:37:58 +02:00
Sergei Golubchik
e7cb032e56 fixes for buildbot:
* update *.result files
* fix XtraDB for Windows (again)
2015-10-10 11:07:29 +02:00
Sergei Golubchik
2ca4141af1 Merge branch 'merge-perfschema-5.6' into 10.0 2015-10-09 18:24:17 +02:00
Sergei Golubchik
01be663c50 Merge branch 'merge-xtradb-5.6' into 10.0 2015-10-09 18:16:27 +02:00
Sergei Golubchik
77c44a3470 update innodb version 2015-10-09 17:48:31 +02:00
Sergei Golubchik
04af573d65 Merge branch 'merge-innodb-5.6' into 10.0 2015-10-09 17:47:30 +02:00
Sergei Golubchik
1b41eed5d1 5.6.27 2015-10-09 17:22:53 +02:00
Sergei Golubchik
86ff4da14d 5.6.27 2015-10-09 17:21:46 +02:00
Sergei Golubchik
6a821d78a6 5.6.26-74.0 2015-10-09 17:20:49 +02:00
Sergei Golubchik
16c4b3c68b fixes for buildbot:
* OSX (mysqlimport freeing unallocated memory)
* Windows (didn't compile MSI)
* fulltest2 (innodb crashes in --embedded --big)
2015-10-09 16:43:59 +02:00
Monty
c696fc74cf Fixed compiler warnings and errors 2015-10-09 13:01:07 +03:00
Sergei Golubchik
f41a41fd91 Merge branch 'merge-xtradb-5.5' into 5.5 2015-10-09 00:06:16 +02:00
Sergei Golubchik
db79f4cf61 5.5.45-37.4 2015-10-08 23:02:43 +02:00
Sergei Golubchik
82e9f6d948 Merge remote-tracking branch 'mysql/5.5' into 5.5 2015-10-08 22:54:24 +02:00
Monty
d278fb4922 Fixed tokudb test result to make it stable (was altering between index and range) 2015-10-08 09:58:44 +03:00
Jan Lindström
21adad000a MDEV-8901: InnoDB: Punch hole is incorrecty done also to log files causing assertion and database corruption
Analysis: Problem is that punch hole does not know the actual page size
of the page and does the page belong to an data file or to a log file.

Fix: Pass down the file type and page size to os layer to be used
when trim is called. Also fix unsafe null pointer access to
actual write_size.
2015-10-06 15:40:26 +03:00
Sergei Golubchik
21175bb316 Don't use flags in the group_by_handler class
instead pass the whole query down and let the engine return
unsupported parts back
2015-10-05 17:14:15 +02:00