summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* lots of post-merge changesSergei Golubchik2011-04-25738-10969/+9203
* updated sys_vars.cc (converting 5.3 mysqld.cc and set_var.ccSergei Golubchik2010-11-265-204/+160
* merge.Sergei Golubchik2010-11-252732-20857/+867460
|\
| * MergeIgor Babaev2010-11-094-3/+82
| |\
| | * Fixed LP bug #668644.Igor Babaev2010-11-084-3/+82
| * | Fixed LP BUG#615378 Incorrect processing of NULL result in Item_cache fixed.unknown2010-11-093-30/+157
| * | Fix buildbot failure introduced by the previous pushSergey Petrunya2010-11-091-1/+0
| * | Fix buildbot failures caused by two previous pushes.Sergey Petrunya2010-11-081-4/+3
| * | Fix buildbot errors: rec_per_key_part can be 0 if re-openingSergey Petrunya2010-11-081-1/+1
| * | [Patch from Monty] Fix stack-overrun crash in subselect_notembedded.testSergey Petrunya2010-11-081-6/+22
| |/
| * Automerge with 5.2Michael Widenius2010-11-0557-314/+905
| |\
| | * Automatic merge with MariaDB 5.1Michael Widenius2010-11-0414-55/+152
| | |\
| | | * Automatic mergeMichael Widenius2010-11-042-35/+43
| | | |\
| | | | * When scanning pages, stop when you are at 'data_file_length'.Michael Widenius2010-11-042-35/+43
| | | * | MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge threadunknown2010-11-0312-20/+109
| | | |/
| | * | Automatic merge with 5.1Michael Widenius2010-11-0447-259/+753
| | |\ \ | | | |/
| | | * Fixed compile error when not using gcc (crashes at least on windows)Michael Widenius2010-11-031-1/+1
| | | * Automatic mergeMichael Widenius2010-11-037-11/+86
| | | |\
| | | | * Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-037-11/+86
| | | * | #endif fixed.unknown2010-11-022-4/+2
| | | |/
| | | * Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-0244-245/+666
| * | | Fixed usage of wrong variable in case of errorsMichael Widenius2010-11-051-2/+2
| * | | MergeIgor Babaev2010-11-023-0/+183
| |\ \ \
| | * \ \ MergeIgor Babaev2010-11-0223-251/+139
| | |\ \ \
| | * | | | Fixed LP bug #669420.Igor Babaev2010-11-023-0/+184
| * | | | | Removed empty lines.Igor Babaev2010-11-021-4/+0
| | |/ / / | |/| | |
| * | | | mergeSergei Golubchik2010-11-0218-245/+96
| |\ \ \ \
| | * | | | fix windows embeddedSergei Golubchik2010-11-022-5/+4
| | * | | | merge w/ 5.2Sergei Golubchik2010-11-0216-240/+92
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | fix LIKE in a vcol function, broken by a fix for mysql bug#54568.Sergei Golubchik2010-10-304-5/+10
| | | * | | merge w/ 5.1Sergei Golubchik2010-10-298-6/+23
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | mysqltest: Fix reversed error check, causing truncated output when testcase f...unknown2010-10-291-5/+6
| | | | * | Fix test failure (timeout) in --valgrind tests in Buildbot.unknown2010-10-272-0/+5
| | | | * | workaround for MySQL BUG#57491Sergei Golubchik2010-10-221-0/+4
| | | | * | Show the number of warm keycache blocks in SHOW STATUSSergei Golubchik2010-10-201-0/+1
| | | | * | Make the skip-on-windows check as the first one, as the master-slave include ...unknown2010-10-261-1/+1
| | | * | | sane implementation of Key_% status variables.Sergei Golubchik2010-10-297-229/+59
| * | | | | Fixed wrong queue_replace(), which caused timeout failure in pbxt.flush_read_...Michael Widenius2010-11-026-6/+43
| | |_|_|/ | |/| | |
| * | | | Fixed bug #665049.Igor Babaev2010-10-293-1/+395
| |/ / /
| * | | 5.2 mergeSergei Golubchik2010-10-28237-1366/+4684
| |\ \ \ | | |/ /
| | * | fixes for windowsSergei Golubchik2010-10-262-1/+4
| | * | merge with 5.1Sergei Golubchik2010-10-25230-1318/+4613
| | |\ \ | | | |/
| | | * better fix for MySQL bugsSergei Golubchik2010-10-204-49/+34
| | | * build mysqld.exe with federatedx not federatedSergei Golubchik2010-10-201-1/+1
| | | * updated test resultsSergei Golubchik2010-10-201-1/+1
| | | * fixed a bad mergeSergei Golubchik2010-10-191-8/+0
| | | * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-1939-368/+890
| | | |\
| | | | * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-1950-384/+1159
| | | | |\
| | | | | * Updated with changes from lp:percona-server/release-5.1.51-12 as of October 1...unknown2010-10-1951-388/+1168
| | | * | | 5.1.51 mergeSergei Golubchik2010-10-19200-977/+3762
| | | |\ \ \ | | | | |/ / | | | |/| |