summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-25179-6388/+33398
|\
| * MergeIgor Babaev2010-11-092-1/+10
| |\
| | * Fixed LP bug #668644.Igor Babaev2010-11-082-1/+10
| * | Fixed LP BUG#615378 Incorrect processing of NULL result in Item_cache fixed.unknown2010-11-091-30/+74
| |/
| * Automerge with 5.2Michael Widenius2010-11-0513-75/+186
| |\
| | * Automatic merge with MariaDB 5.1Michael Widenius2010-11-044-1/+16
| | |\
| | | * MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge threadunknown2010-11-034-1/+16
| | * | Automatic merge with 5.1Michael Widenius2010-11-0410-74/+170
| | |\ \ | | | |/
| | | * Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-031-1/+0
| | | * Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-0210-73/+170
| * | | Fixed usage of wrong variable in case of errorsMichael Widenius2010-11-051-2/+2
| * | | mergeSergei Golubchik2010-11-026-56/+58
| |\ \ \
| | * | | fix windows embeddedSergei Golubchik2010-11-021-4/+2
| | * | | merge w/ 5.2Sergei Golubchik2010-11-025-52/+56
| | |\ \ \ | | | |/ /
| | | * | fix LIKE in a vcol function, broken by a fix for mysql bug#54568.Sergei Golubchik2010-10-301-0/+5
| | | * | merge w/ 5.1Sergei Golubchik2010-10-291-0/+1
| | | |\ \ | | | | |/
| | | | * Show the number of warm keycache blocks in SHOW STATUSSergei Golubchik2010-10-201-0/+1
| | | * | sane implementation of Key_% status variables.Sergei Golubchik2010-10-294-52/+50
| * | | | Fixed wrong queue_replace(), which caused timeout failure in pbxt.flush_read_...Michael Widenius2010-11-023-5/+15
| |/ / /
| * | | 5.2 mergeSergei Golubchik2010-10-2830-279/+518
| |\ \ \ | | |/ /
| | * | merge with 5.1Sergei Golubchik2010-10-2527-238/+461
| | |\ \ | | | |/
| | | * better fix for MySQL bugsSergei Golubchik2010-10-204-49/+34
| | | * fixed a bad mergeSergei Golubchik2010-10-191-8/+0
| | | * 5.1.51 mergeSergei Golubchik2010-10-1925-194/+430
| | | |\
| | * | | forgotten option handledSergei Golubchik2010-10-251-2/+4
| | * | | bugfix: engine defined table options were not showing up in INFORMATION_SCHEM...Sergei Golubchik2010-10-243-25/+41
| * | | | Fixed LP bug #613009unknown2010-10-271-0/+4
| * | | | Fixed LP bug #609121unknown2010-10-272-5/+7
| * | | | Type of the variables fixed.unknown2010-10-272-2/+2
| * | | | Fixed LP bug #601156unknown2010-10-261-1/+1
| * | | | Fixed LP bug #609121unknown2010-10-251-1/+2
| * | | | # No BUG#, a case brought from 5.2's innodb_mysql_lock.testSergey Petrunya2010-10-182-2/+1
| * | | | MariaDB 5.2 -> 5.2 post-merge fixes:Sergey Petrunya2010-10-172-5/+10
| * | | | Merge from mariadb-5.1 (through mariadb-5.2)Igor Babaev2010-10-143-73/+74
| |\ \ \ \ | | |/ / /
| | * | | MergeIgor Babaev2010-10-143-73/+74
| | |\ \ \ | | | |/ /
| | | * | Reverted the MySQL fix for bug 51242 that was rejected once for mariadb-5.1.48Igor Babaev2010-10-141-23/+0
| | | * | Fixes for bugs found by running test case for LP#608369 "Page: 1 Found wrong ...Michael Widenius2010-10-131-4/+5
| | | * | Use less memory on stack in sql_parse.cc and in repair/check for MyISAM & AriaMichael Widenius2010-10-121-46/+69
| * | | | Merge MariaDB 5.2 -> MariaDB 5.3Sergey Petrunya2010-10-142-22/+12
| * | | | Remove garbage commentsSergey Petrunya2010-10-102-11/+0
| * | | | Post-merge fixes part 1Sergey Petrunya2010-10-106-28/+11
| * | | | Merge 5.2->5.3Sergey Petrunya2010-10-10112-2524/+4220
| |\ \ \ \ | | |/ / /
| | * | | Automatic merge with 5.1Michael Widenius2010-10-064-12/+24
| | |\ \ \ | | | |/ /
| | | * | mergeSergei Golubchik2010-09-281-2/+1
| | | |\ \
| | | * | | Fixed bug #57024.Igor Babaev2010-09-262-11/+21
| | | * | | MergeIgor Babaev2010-09-231-0/+1
| | | |\ \ \
| | | | * | | Fixed bug #53161.Igor Babaev2010-09-201-0/+1
| | | * | | | MergeIgor Babaev2010-09-201-1/+2
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Fixed bug #56862 (lp bug #640419).Igor Babaev2010-09-191-1/+2
| | * | | | | Automatic mergeMichael Widenius2010-10-0135-150/+167
| | |\ \ \ \ \