summaryrefslogtreecommitdiff
path: root/storage/perfschema
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-10-261-2/+4
|\
| * 5.6.38Vicențiu Ciorbaru2017-10-251-2/+4
| |
* | Revert "Fix unit test after merge from mysql 5.5.35 perfschema"Vicențiu Ciorbaru2017-05-171-1/+0
| | | | | | | | | | | | This reverts commit 4799af092574e7957d7143c7751acef74a95a495. Upstream provided adequate fix. This commit is no longer necessary.
* | Update perfschema version to 5.6.36 post-mergeVicențiu Ciorbaru2017-05-161-1/+1
| |
* | Merge branch 'merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-05-1613-39/+85
|\ \ | |/
| * 5.6.36Vicențiu Ciorbaru2017-05-1613-39/+85
| |
* | Fix unit test after merge from mysql 5.5.35 perfschemaVicențiu Ciorbaru2017-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem in MariaDB is introduced by this merge commit: c33db2cdc0ab70a874060d58710895f6dac3dea3 The merge comes from mysql and the original author comes from this commit from MySQL: ------------------------------------------------ commit 160b823d146288d66638e4a740d6d2da72f9a689 Author: Marc Alff <marc.alff@oracle.com> Date: Tue Aug 30 12:14:07 2016 +0200 Bug#22551677 SIGNAL 11 IN LF_PINBOX_PUT_PINS Backport to 5.6 ------------------------------------------------ The breaking change is in start_socket_wait_v1 where instead of using m_thread_owner, we make use of my_pthread_getspecific_ptr to fetch a thread local storage value. Unfortunately this invalidates the "m_thread_owner" member when a socket is created. The internals of the socket structure have m_thread_owner set to NULL, but when checking for ownership we actually look at the current thread's key store. This seems incorrect however it is not immediately apparent why. To not diverge from MySQL's reasoning as it is not described what the actual problem was that this commit is trying to fix, I have adjusted the unittest to account for this new behaviour. We destroy the current thread in the unit test, such that the newly created socket actually has no thread owner. The m_thread_owner is untouched in all this.
* | Merge remote-tracking branch 'merge/merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-01-105-64/+129
|\ \ | |/
| * 5.6.35Vicențiu Ciorbaru2017-01-075-64/+129
| |
* | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2016-09-271-1/+1
|\ \ | |/
* | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2016-08-102-6/+12
|\ \ | |/ | | | | 5.6.32
| * 5.6.32Sergei Golubchik2016-08-101-5/+11
| |
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2016-02-162-3/+4
|\ \ | |/
| * 5.6.29Sergei Golubchik2016-02-161-2/+3
| |
* | after-merge: 10.0 part of MDEV-9249 (ERR_remove_state)Sergei Golubchik2015-12-211-1/+1
| |
* | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2015-12-135-8/+45
|\ \ | |/
| * 5.6.28Sergei Golubchik2015-12-135-8/+45
| |
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-10-093-3/+40
|\ \ | |/
| * 5.6.27Sergei Golubchik2015-10-092-2/+39
| |
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-08-0327-103/+293
|\ \ | |/ | | | | 5.6.26
| * 5.6.26Sergei Golubchik2015-08-0326-102/+292
| |
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-06-161-1/+1
|\ \ | |/
* | perfschema 5.6.24Sergei Golubchik2015-05-0529-751/+337
|\ \ | |/ | | | | | | | | | | | | | | | | | | including the big commit commit 305130361bf72726de220f3d2b2787395e10be61 Author: Marc Alff <marc.alff@oracle.com> Date: Tue Feb 10 11:31:32 2015 +0100 WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6 (with the following commits) and related changes in sql/
| * 5.6.24Sergei Golubchik2015-05-0429-757/+338
| |
* | P_S 5.6.22Sergei Golubchik2015-01-212-9/+146
|\ \ | |/
| * 5.6.22Sergei Golubchik2015-01-192-9/+146
| |
* | MDEV-6579: Properly handle gen_pfs_lex_token when cross-compilingJames Le Cuirot2014-08-151-3/+5
| |
* | perfschema 5.6.20Sergei Golubchik2014-08-062-2/+2
|\ \ | |/
| * mysql-5.6.20Sergei Golubchik2014-08-061-1/+1
| |
* | MDEV-6249 mark P_S STABLE and disable it by defaultSergei Golubchik2014-06-091-1/+1
| |
* | MDEV-6258 MariaDB 10.0 performance schema timestamps relative to epochSergei Golubchik2014-06-051-1/+1
| | | | | | | | don't use the interval timer when absolute time values are needed
* | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and ↵Sergei Golubchik2014-05-131-1/+1
| | | | | | | | wrong executable bits
* | 5.5 mergeSergei Golubchik2014-05-091-1/+1
|\ \
| * \ mysql-5.5.37 selective mergeSergei Golubchik2014-03-273-2/+5
| |\ \
| | * | Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171-0/+1
| | | | | | | | | | | | | | | | | | | | to copyright header.
| | * | Bug#16814264: FILTER OUT THE PERFORMANCE_SCHEMA RELAY LOG EVENTS FROM RELAY LOGRitheesh Vedire2014-01-312-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance schema tables are local to a server and they should not be allowed to be executed by the slave from the relay log. From 5.6.10, P_S events are not written into the binary log. But prior to that, from mysql 5.5 onwards, P_S events are written to the binary log by master. The following are problematic scenarios: 1. Master 5.5 -> Slave 5.5 ======================== A) RBR: Slave crashes B) SBR: P_S statements are replicated. 2.Master 5.5 -> Slave 5.6 ======================== A) RBR: SQL thd generates error B) SBR : P_S statements are replicated 3. 5.5 binlog executed on a server 5.5 using mysqlbinlog|mysql ================================================================= A) RBR: Server crash (because of BINLOG'... statement) B) SBR: P_S statements are executed 4. 5.5 binlog executed on server 5.6 using mysqlbinlog|mysql ================================================================ A) RBR: SQL error (because of BINLOG'... statement) B) SBR: P_S statements are executed. The generalized behaviour should be: a) Slave SQL thread should certainly ignore P_S events read from the relay log. b) mysqlbinlog|mysql should replay the binlog succesfully.
* | | | perfschema 5.6.17Sergei Golubchik2014-05-0774-430/+959
|\ \ \ \ | | |_|/ | |/| |
| * | | 5.6.17Sergei Golubchik2014-05-0777-442/+972
| | | |
| * | | perfschema 5.6.10 initial commit.Sergei Golubchik2014-05-06172-0/+50229
| / / | | | | | | | | | 10.0 files
* | | making perfschema easier to merge: remove unnecessary changesSergei Golubchik2014-05-063-98/+54
| | |
* | | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-042-4/+2
| | |
* | | mergeSergei Golubchik2014-02-283-2/+7
|\ \ \
| * \ \ 10.0-base mergeSergei Golubchik2014-02-263-2/+7
| |\ \ \
| | * \ \ 5.5 mergeSergei Golubchik2014-02-252-2/+3
| | |\ \ \ | | | |/ /
| | | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-172-2/+3
| | | |\ \ | | | | |/ | | | | | | | | | | (without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
| | | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| | | | |
| | | | * Bug#17928281 'CHECK_PERFORMANCE_SCHEMA()' LEAVES 'CURRENT_THD' REFERRINGMarc Alff2013-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DESTRUCTED THD OBJ Prior to fix, function check_performance_schema() could leave behind stale pointers in thread local storage, for the following keys: - THR_THD (used by _current_thd) - THR_MALLOC (used for memory allocation) This is an unsafe practice, which can potentially cause crashes, and that can cause other bugs when code is modified during maintenance. With this fix, thread local storage keys used temporarily within function check_performance_schema() are cleaned up after use.
* | | | | Fixing AIX compilation failiresAlexander Barkov2014-02-271-5/+9
|/ / / /
* | | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-152-2/+4
|\ \ \ \ | |/ / /
| * | | A follow-up for the previous commit:Alexander Barkov2013-10-022-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-4425 Regexp enhancements Adding ${CMAKE_BINARY_DIR}/pcre into search path for *.h files. Needed for find pcre.h (which is generated from pcre.h.in) when build directory != source directory.
View Lorry Controller Status