summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation10.2-sslVladislav Vaintroub2016-02-101-1/+1
|
* Changed my_thread_id to int64 to fix compilation problem withMonty2016-02-081-1/+1
| | | | | | my_atomic_add32_explicit on windows Fixed that server_audit.c also works if one compiles with safemalloc Fixed compiler warnings
* MDEV-6150 Speed up connection speed by moving creation of THD to new threadMonty2016-02-073-4/+6
| | | | | | | | | | | | | | | | Creating a CONNECT object on client connect and pass this to the working thread which creates the THD. Split LOCK_thread_count to different mutexes Added LOCK_thread_start to syncronize threads Moved most usage of LOCK_thread_count to dedicated functions Use next_thread_id() instead of thread_id++ Other things: - Thread id now starts from 1 instead of 2 - Added cast for thread_id as thread id is now of type my_thread_id - Made THD->host const (To ensure it's not changed) - Removed some DBUG_PRINT() about entering/exiting mutex as these was already logged by mutex code - Fixed that aborted_connects and connection_errors_internal are counted in all cases - Don't take locks for current_linfo when we set it (not needed as it was 0 before)
* Optimized intkorr() and intstore(functions) for intel 64 bits.Monty2016-02-072-24/+85
| | | | (Benchmarked, about 30 % faster and 50 % smaller than original)
* Merge branch '10.1' into 10.2Monty2016-02-063-3/+3
|\ | | | | | | | | | | | | | | | | | | Conflicts: VERSION cmake/plugin.cmake config.h.cmake configure.cmake plugin/server_audit/server_audit.c sql/sql_yacc.yy
| * 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.
* | | | MDEV-9117: Client Server capability negotiation for MariaDB specific ↵Oleksandr Byelkin2016-02-021-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality New capability flags space. Removed old progress flag, added new one.
* | | | Adding "const" qualifier to the argument of decimal_actual_fraction().Alexander Barkov2016-01-141-1/+1
| | | |
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-2910-7/+27
|\ \ \ \ | |/ / /
| * | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-0810-13/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.10 maria/10.0.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codership-mysql/5.6 (r4021..4065). - Also contains fixes for some build failures.
| | | * | | | | | | | | | | | | | | | bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).Nirbhay Choubey2014-03-251-1/+1
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-2620-98/+159
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix for post-merge build failures.
| | * | | | | | | | | | | | | | | | | MDEV#5626 : Cannot install InnoDB/XtraDB pluginNirbhay Choubey2014-02-101-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (undefined symbol: wsrep_md5_update) Refactored wsrep's md5 related code so that Innodb/xtradb no longer relies on mysys_ssl for md5 implementation.
| | * | | | | | | | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-2519-133/+308
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-0425-63/+588
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and a number of fixes to make this buildable. Run also few short multi-master high conflict rate tests, with no issues
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 10.0 to galera-10.0Jan Lindström2013-09-0362-922/+1575
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-1331-114/+386
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-216-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-211-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | MDEV-9249 MariaDB un-buildable on linux64: fails @ "error: ↵Sergei Golubchik2015-12-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ‘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
| | * | | | | | | | | | | | | | | | | | | | MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in manymariadb-10.0.23Sergey Vojtovich2015-12-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the plugins Removed exit() from daemon_example, pass error to caller instead. Also removed unused my_abort_hook.
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2015-12-132-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | 5.6.28Sergei Golubchik2015-12-132-0/+3
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Correct comments before mysql_socket_{g|s}etfd to refer to the right functionDaniel Black2015-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | |
View Lorry Controller Status