Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -5/+10 |
* | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 1 | -4/+0 |
* | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -2/+2 |
|\ | |||||
| * | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -2/+2 |
| |\ | |||||
| | * | merge 5.1 => 5.5 | Tor Didriksen | 2012-07-27 | 1 | -4/+2 |
| | |\ | |||||
| | | * | Bug#14111180 HANDLE_FATAL_SIGNAL IN PTR_COMPARE_1 / QUEUE_INSERT | Tor Didriksen | 2012-07-27 | 1 | -3/+2 |
* | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -12/+11 |
|\ \ \ \ | |||||
| * \ \ \ | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -12/+11 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | MWL#182: Explain running statements | Sergey Petrunya | 2012-06-25 | 1 | -5/+0 |
| | * | | | SHOW EXPLAIN: Code cleanup | Sergey Petrunya | 2012-06-08 | 1 | -3/+0 |
| | * | | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5} | Sergey Petrunya | 2012-05-17 | 1 | -9/+16 |
| | |\ \ \ | |||||
| | | * | | | MDEV-238: SHOW EXPLAIN: Server crashes in JOIN::print_explain with FROM subqu... | Sergey Petrunya | 2012-05-10 | 1 | -0/+6 |
| | | * | | | MWL#182: Explain running statements | Sergey Petrunya | 2012-04-26 | 1 | -9/+11 |
* | | | | | | Merge MDEV-415 -> 10.0-base. | Igor Babaev | 2012-09-01 | 1 | -163/+389 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line. | Igor Babaev | 2012-09-01 | 1 | -160/+389 |
| |/ / / / | |||||
* | | | | | Merge from 5.3 | unknown | 2012-08-24 | 1 | -5/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Corrected the pactch for mdev-449 to fix valgrind failures. | Igor Babaev | 2012-08-14 | 1 | -3/+3 |
| * | | | | Fixed bug mdev-449. | Igor Babaev | 2012-08-13 | 1 | -5/+7 |
| |/ / / | |||||
* | | | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge the 5.5.22 release build into main 5.5, | Joerg Bruehe | 2012-03-20 | 1 | -100/+107 |
| |\ \ \ | |||||
| * | | | | Bug#13832772 ASSERTION `THD->IS_ERROR() || KILL_ERRNO' | Tor Didriksen | 2012-03-14 | 1 | -1/+1 |
* | | | | | merge | Sergei Golubchik | 2012-04-07 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | merge | Sergei Golubchik | 2012-04-05 | 1 | -13/+37 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -13/+37 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2012-02-17 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
| | | | | |\ \ \ | |||||
* | | | | | \ \ \ | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -84/+65 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Bug#13633383 63183: SMALL SORT_BUFFER_SIZE CRASH IN MERGE_BUFFERS | Tor Didriksen | 2012-02-14 | 1 | -98/+81 |
| * | | | | | | | | Merge 5.1-security => 5.5-security | Tor Didriksen | 2012-01-27 | 1 | -12/+36 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Bug#13580775 ASSERTION FAILED: RECORD_LENGTH == M_RECORD_LENGTH | Tor Didriksen | 2012-01-27 | 1 | -12/+36 |
| | | |_|_|/ / | | |/| | | | | |||||
* | | | | | | | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 1 | -41/+31 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Improve filesort performance for small sorts: Don't write pointers to records... | unknown | 2012-03-24 | 1 | -38/+27 |
| * | | | | | | Backport some simple performance patches from 5.5. | unknown | 2012-03-22 | 1 | -2/+2 |
* | | | | | | | Few simple performance fixes found with sysbench oltp.lua and Oprofile: | unknown | 2012-03-21 | 1 | -2/+2 |
* | | | | | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" | Michael Widenius | 2012-03-13 | 1 | -3/+4 |
* | | | | | | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. | unknown | 2012-03-12 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
* | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -5/+7 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+6 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -4/+6 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
* | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -13/+18 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge. | Igor Babaev | 2011-10-28 | 1 | -6/+5 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge. | Igor Babaev | 2011-06-01 | 1 | -6/+5 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Backported the test case for bug 43617 fixed by the patch for bug 42580. | Igor Babaev | 2011-05-27 | 1 | -6/+5 |
| * | | | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -4/+4 |
| * | | | | | | | | BUG#834514: Assertion `!table || (!table->read_set || bitmap_is_set(...' with... | Sergey Petrunya | 2011-09-03 | 1 | -3/+9 |