summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.1-release.Michael Widenius2010-12-061-7/+13
|\
| * Merge MariaDB 5.1->5.2unknown2010-11-191-7/+13
| |\
| | * MWL#74: Shared libmysqld.so library.unknown2010-11-171-3/+4
| | * MBug#643463: Slow XtraDB shutdown: Fix more sleeps delaying shutdown.unknown2010-11-091-2/+3
| | * Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th...Michael Widenius2010-11-071-2/+6
* | | Fixed some compiler warnings found when compiling for windows.Michael Widenius2010-11-301-2/+2
* | | Automerge with 5.2Michael Widenius2010-11-051-2/+6
|\ \ \ | |/ /
| * | Automatic merge with 5.1Michael Widenius2010-11-041-2/+6
| |\ \ | | |/
| | * Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-2/+6
* | | merge w/ 5.2Sergei Golubchik2010-11-021-7/+41
|\ \ \ | |/ /
| * | 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-291-7/+40
* | | 5.2 mergeSergei Golubchik2010-10-281-10/+11
|\ \ \ | |/ /
| * | merge with 5.1Sergei Golubchik2010-10-251-10/+11
| |\ \ | | |/
| | * fixed a bad mergeSergei Golubchik2010-10-191-8/+0
| | * 5.1.51 mergeSergei Golubchik2010-10-191-5/+14
| | |\
| | | * Fixed bug #29751 - do not rename the error log at FLUSH LOGS.Dmitry Shulga2010-08-251-7/+12
* | | | Merge from mariadb-5.1 (through mariadb-5.2)Igor Babaev2010-10-141-4/+5
|\ \ \ \ | |/ / /
| * | | MergeIgor Babaev2010-10-141-4/+5
| |\ \ \ | | |/ /
| | * | Fixes for bugs found by running test case for LP#608369 "Page: 1 Found wrong ...Michael Widenius2010-10-131-4/+5
* | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-559/+711
|\ \ \ \ | |/ / /
| * | | Automatic mergeMichael Widenius2010-10-011-16/+5
| |\ \ \
| | * | | mysqld: Move --skip-new to --safe and remove old usage of --skip-newMichael Widenius2010-09-241-11/+4
| | * | | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable...Michael Widenius2010-09-231-5/+1
| * | | | rename maria to ariaSergei Golubchik2010-09-121-4/+4
| * | | | merge with 5.1Sergei Golubchik2010-09-111-27/+43
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Give a more precise warning why something fails.Michael Widenius2010-09-081-2/+1
| | * | Automatic mergeMichael Widenius2010-09-071-10/+14
| | |\ \
| | | * | Fixed recovery bug where bitmap pages would not be correctly updated after pr...Michael Widenius2010-09-071-2/+3
| | | * | Fixed bug that 'maria_read_log -a' didn't set max_trid when reparing tables.Michael Widenius2010-09-061-10/+13
| | * | | Added --skip-bdb as a compatibility option for old config filesMichael Widenius2010-09-071-0/+8
| | |/ /
| | * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-15/+20
| | |\ \ | | | |/
| | | * Automerge.Alexey Kopytov2010-07-211-1/+1
| | | |\
| | | | * Bug#55061: Build failing on sol 8 x86 - assembler code vs Alexey Kopytov2010-07-121-1/+1
| | | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-4/+3
| | | |/
| | | * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-14/+17
| * | | Automerge with 5.1Michael Widenius2010-08-251-4/+6
| |\ \ \ | | |/ /
| | * | Added verbose mode to recoveryMichael Widenius2010-08-181-4/+6
| * | | Merge with 5.2Michael Widenius2010-08-091-1/+7
| |\ \ \ | | |/ /
| | * | Added --sync-sys=0 option for mysqld to skip sync() calls for faster testingMichael Widenius2010-08-091-1/+7
| * | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-502/+626
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-498/+623
| | |\ \ | | | |/
| | | * Automerge.Alexey Kopytov2010-07-011-1/+1
| | | |\
| | | | * Bug#54667: Unnecessary signal handler redefinitionAlexey Kopytov2010-07-011-1/+1
| | | * | Bug#54457: Test suite broken for 32-bit buildDavi Arnaut2010-06-281-1/+1
| | | |/
| | | * Backport of the patch for bug52208 to 5.1 since theAlexey Kopytov2010-06-151-3/+3
| | | * Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-0/+7
| | | |\
| | | | * Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-211-0/+7
| | | * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-462/+526