summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* WL#5363: Thread Pool Service InterfaceMats Kindahl2010-06-071-34/+17
* Backport of:Konstantin Osipov2010-04-131-10/+16
* 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-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
| * | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-221-3/+6
| |\ \ \
| | * \ \ mergeVladislav Vaintroub2010-02-161-5/+10
| | |\ \ \
| | * \ \ \ mergeVladislav Vaintroub2010-02-131-12/+13
| | |\ \ \ \
| | * \ \ \ \ mergeVladislav Vaintroub2010-02-061-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ merge, add plugin/audit_null/CMakeLists.txtVladislav Vaintroub2010-01-261-15/+22
| | |\ \ \ \ \ \
| | * | | | | | | Fix failing sys_vars.plugin_dir_basic - treat both '/' and '\' as path separa...Vladislav Vaintroub2010-01-241-1/+1
| | * | | | | | | mergeVladislav Vaintroub2010-01-221-1/+14
| | |\ \ \ \ \ \ \
| | * | | | | | | | Cherrypick fix for -DWITH_SSL=system by Marc Alff (Bug#50513)Vladislav Vaintroub2010-01-211-7/+14
| | * | | | | | | | mergeVladislav Vaintroub2010-01-181-0/+1
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | fix for 32 bit Linux problem reported by TimothyVladislav Vaintroub2010-01-151-0/+3
| | * | | | | | | | | mergeVladislav Vaintroub2010-01-141-79/+86
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2010-01-131-0/+17
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2010-01-111-195/+832
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-251-1965/+432
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-191-4/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-191-29/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-161-12/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-111-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Introduce a workaround for Solaris' inability to deal with dtrace in static ...Vladislav Vaintroub2009-12-111-2/+2
| * | | | | | | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-201-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-19/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-16/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-1/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-041-81/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-0/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-195/+831
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-1964/+366
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. Konstantin Osipov2010-02-021-1/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-4/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-41/+82
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-081-2/+3
| | * | | | | | | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+4
| | * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-031-145/+85
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-2/+3
| * | | | | | | | | | | | | | | | | | | | WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-02-171-54/+2
| * | | | | | | | | | | | | | | | | | | | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-02-171-17/+0
| * | | | | | | | | | | | | | | | | | | | Bug#48929 Error in Accept() if using many file descriptorsMagne Mahre2010-02-141-10/+54
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | |