summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-28/+35
|\
| * Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-171-1/+8
| |\
| * \ Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-161-12/+39
| |\ \
| * | | Merge cleanupMarc Alff2009-12-111-5/+5
| * | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-2/+3
| |\ \ \
| * | | | WL#2360 Performance schemaMarc Alff2009-12-091-27/+34
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-171-0/+5
|\ \ \ \ \
| * \ \ \ \ Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-171-0/+5
| |\ \ \ \ \
| | * \ \ \ \ merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-171-0/+5
| | |\ \ \ \ \
| | | * | | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-171-1/+6
* | | | | | | | Auto-merge from mysql-next-mr-summit0.3.Alexander Nozdrin2009-12-161-1/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge to latest mysql-next-mrMikael Ronstrom2009-12-161-12/+39
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | MergeMikael Ronstrom2009-12-141-147/+88
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-29/+14
| |\ \ \ \ \ \ \
| * | | | | | | | WL#5138, fixed review commentsMikael Ronstrom2009-11-231-0/+3
| * | | | | | | | WL#5138, reverted some review fixesMikael Ronstrom2009-11-201-1/+1
| * | | | | | | | WL#5138, review fixesMikael Ronstrom2009-11-201-1/+1
| * | | | | | | | WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-201-1/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-121-1/+5
* | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-1/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-121-1/+0
| * | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-3/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug #48742 Replication: incorrect help text for --init-slaveunknown2009-12-111-1/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Bug #48742 Replication: incorrect help text for --init-slaveunknown2009-12-111-1/+2
| | * | | | | | | BUG#45292 orphan binary log created when starting server twiceAlfranio Correia2009-12-041-2/+2
* | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-12/+39
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-196/+211
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-5/+11
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Bug#47571 : idle named pipe connection is unkillableVladislav Vaintroub2009-11-201-5/+11
| * | | | | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-7/+28
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mergeGeorgi Kodinov2009-11-101-7/+7
| | |\ \ \ \ \ \
| | | * | | | | | Bug #32167: another privilege bypass with DATA/INDEX DIRECTORYGeorgi Kodinov2009-11-031-7/+7
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Bug #34739 unexpected binlog file name when --log-bin is set to a directory ...unknown2009-11-051-0/+21
* | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-031-40/+76
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-021-105/+9
| |\ \ \ \ \ \ \
| * | | | | | | | A patch for Bug#48915 (After having switched off the ipv6 support in OS,Alexander Nozdrin2009-12-011-2/+2
| * | | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-39/+75
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-105/+9
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-105/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-11/+19
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | mergeVladislav Vaintroub2009-11-031-1/+1
| | | |\ \ \ \ \
| | * | \ \ \ \ \ manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-104/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-104/+9
| | * | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-10/+68
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-29/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Backport of:Konstantin Osipov2009-11-241-6/+6
| * | | | | | | | | Backport of:Konstantin Osipov2009-11-231-21/+5
| * | | | | | | | | Backport of:Konstantin Osipov2009-11-201-2/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | merging.Alexey Botchkov2009-11-171-1/+2
|\ \ \ \ \ \ \ \ \