summaryrefslogtreecommitdiff
path: root/mysql-test/include/mtr_warnings.sql
Commit message (Expand)AuthorAgeFilesLines
* Merge InnoDB fixes from 5.5 revisions 4229, 4230, 4233, 4237 and 4238 i.e.Jan Lindström2014-07-251-0/+1
* MDEV-5080 Assertion `strcmp(share->unique_file_name,filename) || share->last_...Sergei Golubchik2013-11-041-1/+1
* Instead of writing "Errcode" to the log for Slave errors, use "Internal Maria...Michael Widenius2013-05-031-1/+1
* Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-1/+0
|\
| * MDEV-531 : Warning: Forcing close of thread ... in rpl_binlog_indexVladislav Vaintroub2012-11-021-1/+0
* | MDEV-225: Replace with dummy events an event that is not understood by a slav...unknown2012-06-221-0/+2
|/
* mergeSergei Golubchik2012-01-161-1/+1
|\
| * MDEV-63 - attempt to fix the warning exclusionVladislav Vaintroub2012-01-091-1/+1
* | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ | |/ |/|
| * Merge with 5.2.Michael Widenius2011-12-111-0/+15
| |\
| | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-0/+15
| | |\
* | | \ mysql-5.5.18 mergeSergei Golubchik2011-11-031-0/+15
|\ \ \ \
| * \ \ \ Merge from mysql-5.1 to mysql-5.5.Jon Olav Hauglid2011-07-041-14/+14
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix MTR broken by last push.Jon Olav Hauglid2011-07-041-14/+14
| | * | | Updated/added copyright headersKent Boortz2011-07-031-47/+2
| | |\ \ \
| * | \ \ \ Updated/added copyright headersKent Boortz2011-06-301-0/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-0/+15
* | | | | | merge with 5.3Sergei Golubchik2011-10-191-1/+11
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-39/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-46/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-031-0/+3
| |/ / / /
* | | | | 5.5-mergeSergei Golubchik2011-07-021-47/+19
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | mtr: cleaned up some superfluos global warning suppressionsBjorn Munch2011-03-301-43/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mtr: cleaned up some superfluos global warning suppressionsBjorn Munch2011-03-301-45/+1
| * | | | Upmerge 11762407 (54999) with additionsBjorn Munch2011-02-231-1/+0
| |\ \ \ \ | | |/ / /
| | * | | Bug #11762407 54999: MTR GLOBAL SUPPRESSION HIDES SQL THREAD EXECUTION UNEXPE...Bjorn Munch2011-02-231-1/+0
| | | |/ | | |/|
| * | | Bug #36022 please log more information about "Sort aborted" queriesTor Didriksen2011-02-021-3/+0
| * | | A patch for Bug#48874 (Test "is_triggers" fails because of wrong charset info).Alexander Nozdrin2010-10-141-0/+18
* | | | merge.Sergei Golubchik2010-11-251-0/+11
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge with MySQL 5.1.47Michael Widenius2010-05-261-0/+2
| |\ \ | | |/
| | * Backport revision alik@sun.com-20100223131824-comthndat57kx8s5:Davi Arnaut2010-04-091-0/+2
| * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+13
| |\ \ | | |/
| * | Merge with MySQL 5.1.42Michael Widenius2010-01-151-0/+10
| |\ \
| * \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-2/+5
| |\ \ \
| * \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-081-2/+2
| |\ \ \ \
| * | | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-0/+10
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-8/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-231-0/+14
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
* | | | | | | Add ignore pattern for valgrind messages.Alexander Nozdrin2010-02-231-0/+2
* | | | | | | fixed wrong merge conflict in mysql-test/include/mtr_warnings.sqlBjorn Munch2010-02-161-0/+1
* | | | | | | new merge from next-mrBjorn Munch2010-02-161-0/+6
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Backport of revno: 2617.68.18Jon Olav Hauglid2009-12-091-0/+8
| * | | | | | | new merge from next-mrBjorn Munch2009-10-221-0/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ upmerge 50414Bjorn Munch2010-02-031-0/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Bug #50414 valgrind warnings: invalid file descriptor -1 in syscallunknown2010-02-031-0/+6
* | | | | | | | | upmergeBjorn Munch2009-12-161-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge from 5.1 mainBjorn Munch2009-12-161-0/+8
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | merge from trunkBjorn Munch2009-12-161-0/+8
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-0/+8
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |