summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-03-212-2/+2
|\
| * Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-1/+1
| |
| * Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-1/+1
| |
* | Fix to ensure updates in gtid_slave_state table do not get binlogged.Nirbhay Choubey2016-02-241-3/+3
| | | | | | | | | | Also, renamed wsrep_skip_append_keys to wsrep_ignore_table. Test case : galera.galera_as_slave_gtid.test
* | Merge branch 'bb-10.1-serg' into 10.1Sergei Golubchik2016-02-245-19/+17
|\ \ | | | | | | | | | | | | | | | 10.0 merge 10.0-galera merge connect/10.1 merge
| * \ Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-0/+9
| |\ \
| | * \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-236-21/+14
| | |\ \ | | | |/
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-234-19/+8
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-173-18/+7
| | |\ \
| | | * | MDEV-9308 Fix build errors with recent gcc (isfinite)Sergei Golubchik2016-02-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "#include <math.h>" has "#define isfinite(X) ..." while "#include <cmath>" does "#undef isfinite" in -std=c++11 mode <cmath> is included, we need a workaround to provide a usable isfinite()
| | | * | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-153-18/+4
| | | |\ \
| | | | * | dtrace in cmakeSergei Golubchik2016-02-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. ignore generated dtrace files 2. don't rewrite probes_mysql_nodtrace.h in-place
| | | | * | better inline checkSergei Golubchik2016-02-151-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. check that unused inline functions are removed 2. only allow compilation if they are or if the check if overridden 3. with CMAKE_GENERATOR=Makefiles, use all flags when testing (e.g. both CMAKE_C_FLAGS and CMAKE_C_FLAGS_DEBUG if CMAKE_BUILD_TYPE=Debug). This is because - on Solaris with the SunPro compiler, default CMAKE_C_FLAGS_xxx values contain -xO2 (for Release and RelWithDebInfo) and -g (for RelWithDebInfo and Debug) - proper inlining only works at -xO4 without -g - so if CMAKE_C_FLAGS has -xO4, inlining would work in configure.cmake (before this fix) and fail during actual compilation also remove the outdated check for inline from myu_global.h
| | | | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-3/+3
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverted about half of commits as either not applicable or outright wrong
| | | | | * | Updated copyright year in user visible textBjorn Munch2016-01-111-2/+2
| | | | | | |
| | | | | * | Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-071-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem Statement ========= Fix various issues when building MySQL with Visual Studio 2015. Fix: ======= - Visual Studio 2015 adds support for timespec. Add check and related code to use this and only use our replacement if timespec is not defined. - Rename lfind/lsearch to my* to avoid redefinition problems. - Set default value for TMPDIR to "" on Windows as P_tmpdir no longer exists. - using VS definition of snprintf if available - tzname are now renamed to _tzname.
| | | | | * | Bug #21221862 NEWEST RHEL/CENTOS OPENSSL UPDATE BREAKS MYSQL DHE CIPHERSV S Murthy Sidagam2015-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description: The newest RHEL/CentOS/SL 6.6 openssl package (1.0.1e-30.el6_6.9; published around 6/4/2015) contains a fix for LogJam. RedHat's fix for this was to limit the use of any SSL DH key sizes to a minimum of 768 bits. This breaks any DHE SSL ciphers for MySQL clients as soon as you install the openssl update, since in vio/viosslfactories.c, the default DHPARAM is a 512 bit one. This cannot be changed in configuration/runtime; and needs a recompile. Because of this the client connection with --ssl-cipher=DHE-RSA-AES256-SHA is not able to connect the server. Analysis: Openssl has changed Diffie-Hellman key from the 512 to 1024 due to some reasons(please see the details at http://openssl.org/news/secadv_20150611.txt) Because of this the client with DHE cipher is failing to connect the server. This change took place from the openssl-1.0.1n onwards. Fix: Similar bug fix is already pushed to mysql-5.7 under bug#18367167. Hence we backported the same fix to mysql-5.5 and mysql-5.6.
| | | | | * | Raise version number after cloning 5.5.42Bala2015-01-051-2/+2
| | | | | | |
| | | | * | | MDEV-9024 Build fails with VS2015Sergei Golubchik2016-02-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick f1daf9ce from 10.0 branch ------------------------------------- Fix build failures caused by new C runtime library - isnan, snprintf, struct timespec are now defined, attempt to redefine them leads - P_tmpdir, tzname are no more defined - lfind() and lsearch() in lf_hash.c had to be renamed, declaration conflicts with some C runtime functions with the same name declared in a header included by stdlib.h Also fix couple of annoying warnings : - remove #define NOMINMAX from config.h to avoid "redefined" compiler warnings(NOMINMAX is already in compile flags) - disable incremental linker in Debug as well (feature not used much and compiler crashes often) Also simplify package building with Wix, require Wix 3.9 or later (VS2015 is not compatible with old Wix 3.5/3.6)
| | | | * | | MDEV-9466 : Exception handler on Windows does not output any text,Vladislav Vaintroub2016-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if mysqld runs as service The bug is caused by the attempt to write to filedescriptor 2 (STDERR_FILENO), however in case of a service stderr has different fd (debugging shows fileno(stderr) is 4 after freopen, and -1 before it) Fixed definition of STDERR_FILENO for Windows to be fileno(stderr).
| | * | | | | MDEV-9511 Valgrind warnings 'Invalid read' in Field_newdate::cmp and ↵Alexander Barkov2016-02-171-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Field_newdate::val_str
| | * | | | Merge MDEV-9112 into 10.0Kristian Nielsen2016-02-011-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | Conflicts: configure.cmake
* | | | | | MDEV-7231 Field ROUTINE_DEFINITION in INFORMATION_SCHEMA.`ROUTINES`Alexander Barkov2016-02-241-0/+13
|/ / / / / | | | | | | | | | | | | | | | contains broken procedure body when used shielding quotes inside.
* | | | | cleanupSergei Golubchik2016-02-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make a local variable for target_table->field[col] * move an often-used bit function to my_bit.h * remove a non-static and not really needed trivial comparison function with a very generic name
* | | | | Fixes needed to compile with musl C libraryMonty2016-02-071-2/+4
| | | | | | | | | | | | | | | | | | | | Patch originally by Codarren Velvindron
* | | | | Merge MDEV-9112 into 10.1Kristian Nielsen2016-02-011-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Conflicts: config.h.cmake configure.cmake
| * | | | MDEV-9112: Non-blocking client API missing on non-x86 platformsGeorg Richter2016-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for UCONTEXT in cmake was somehow become broken, disabling the fallback to ucontext. This caused the non-blocking client API to not be available for non-x86 platforms, on which no hand-crafted assembler implementation of my_context is available.
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-01-251-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows.Vladislav Vaintroub2016-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix test whether process is alive in mysqltest. Also fix SHUT_RD definition on Windows to be SD_RECEIVE. SD_BOTH was used instead prior to this patch, and this would occasionally make mysql_shutdown() fail - when the socket for the current connection is not able send the COM_SHUTDOWN response anymore.
* | | | | stack too small on labrador (again!)Sergei Golubchik2016-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | increase the thread stack a bit for main.signal_demo3 and sys_vars.max_sp_recursion_depth_func to stop failing
* | | | | Revert "Fixed compilation failure on MacOSX"Vicențiu Ciorbaru2016-01-171-2/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit df32495c85d75b736ee8d251d07b70b3682dda4d.
* | | | | Fixed compilation failure on MacOSXVicențiu Ciorbaru2016-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a hack that has propagated to the maria storage engine, undefined behaviour would result by bypassing the initialization code of variables after my_thread_init(). By refactoring the nested logic into a separate function, this problem is resolved.
* | | | | remove HA_ERR_INFO, use ER_ALTER_INFOSergei Golubchik2015-12-232-4/+2
| | | | |
* | | | | Don't send error 0 to my_printf_error()Monty2015-12-232-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed by adding HA_ERR_INFO as a informational warning to by used by MyISAM This is used to inform when we create a backup copy of the data file. Also improved informational messages when creating backup copies of data and index files
* | | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-222-1/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Note: some tests fail, just as they failed before the merge!
| * | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-197-6/+14
| |\ \ \ \
| * \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-319-21/+30
| |\ \ \ \ \
| * | | | | | Add close-on-exec flag to open(), socket(), accept() & fopen().Nirbhay Choubey2015-06-242-1/+29
| | | | | | |
| * | | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-219-63/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-097-80/+34
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-1/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: storage/innobase/include/trx0trx.h
| * \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2015-02-183-3/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 10.0 till revision: f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0 Conflicts: .bzrignore storage/xtradb/CMakeLists.txt
| * \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-264-9/+22
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bzr merge -r4588 maria/10.0
| * | | | | | | | | | | MDEV-6891: Addendum, update company name in copyright noticeNirbhay Choubey2014-12-121-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-052-10/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-285-38/+63
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-114-11/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Local merge of patch for MDEV-3896 from maria-5.5-galera.Nirbhay Choubey2014-07-211-0/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-193-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-2110-22/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \