summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-6/+7
|\
| * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-14/+17
| * Automerge.Alexey Kopytov2010-07-011-1/+1
| |\
| * | Bug#54457: Test suite broken for 32-bit buildDavi Arnaut2010-06-281-1/+1
* | | Manual merge from 5.1.Alexey Kopytov2010-07-011-1/+1
|\ \ \ | | |/ | |/|
| * | Bug#54667: Unnecessary signal handler redefinitionAlexey Kopytov2010-07-011-1/+1
| |/
* | WL#5349 Change default storage engine to InnoDBMagne Mahre2010-06-171-0/+8
* | Bug#52208: gis fails on some platforms (Solaris, HP-UX, Linux)Alexey Kopytov2010-06-151-3/+3
|\ \ | |/
| * 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
| |\
* | \ Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-06-111-0/+4
|\ \ \
| * \ \ 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
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-101-104/+126
|\ \ \ | |/ /
| * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-462/+526
* | | Manual merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-071-18/+18
|\ \ \
| * | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-05-311-10/+11
| * | | Backport: remove dead code.Davi Arnaut2010-05-281-1/+0
| * | | Auto-merge from mysql-trunk.Alexander Nozdrin2010-05-281-6/+64
| |\ \ \
| * | | | Bug #53445 Build with -Wall and fix warnings that it generatesTor Didriksen2010-05-261-4/+2
| * | | | Merge of bug#51851.Mattias Jonsson2010-05-241-3/+5
| |\ \ \ \
| | * | | | Bug#51851: Server with SBR locks mutex twice on LOAD DATAMattias Jonsson2010-03-301-3/+5
* | | | | | mergeGeorgi Kodinov2010-06-041-0/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | mergeGeorgi Kodinov2010-06-041-0/+7
| |\ \ \ \
| | * | | | Bug #52315: utc_date() crashes when system time > year 2037Georgi Kodinov2010-06-041-0/+8
| * | | | | Bug #48537: difference of index selection between rpm binaryAlexey Kopytov2010-05-291-1/+35
| | |_|_|/ | |/| | |
* | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-091-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | On behalf of Kristofer :Georgi Kodinov2010-05-051-0/+5
* | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-071-4/+42
|\ \ \ \ \ | |/ / / /
| * | | | Bug#50373 --secure-file-priv=""Kristofer Pettersson2010-05-031-4/+42
* | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-301-3/+18
|\ \ \ \ \ | |/ / / /
| * | | | Bug#50373 --secure-file-priv=""Kristofer Pettersson2010-04-201-1/+1
| * | | | AutomergeKristofer Pettersson2010-04-161-8/+27
| |\ \ \ \
| * | | | | Bug#50373 --secure-file-priv=""Kristofer Pettersson2010-04-161-3/+18
* | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2010-04-271-10/+16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Backport of:Konstantin Osipov2010-04-131-10/+16
* | | | | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-1/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-071-1/+1
| * | | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-051-1/+1
| * | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-2/+38
* | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-04-031-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Bug #37168: Missing variable - skip_name_resolveGeorgi Kodinov2010-03-311-0/+3
| * | | | BUG#51866 - crash with repair by sort and fulltext keysSergey Vojtovich2010-03-251-1/+1
* | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-2625/+1573
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix for BUG#51215 "log-error partially works with version 5.5": WL 4738 (reen...Guilhem Bichot2010-03-051-0/+13
| * | | | A follow-up on WL#5154 and WL#5182: remove forgotten options.Alexander Nozdrin2010-03-031-53/+2
| * | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-021-26/+29
| |\ \ \ \
| | * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-26/+29
| | |\ \ \ \
| * | \ \ \ \ merging to 6.0-codebase-bugfixing from a local branchAndrei Elkin2010-02-281-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Bug #50296 Slave reconnects earlier than the prescribed slave_net_timeout valueAndrei Elkin2010-02-281-1/+2