summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-26/+29
|\
| * Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-02-091-89/+117
| |\
| | * Bug#49025: mysqld-debug: missing DBUG_RETURN or DBUG_VOID_RETURN macro in fun...Davi Arnaut2010-02-051-5/+6
| | * Recommit of Bug#49447.Staale Smedseng2010-02-041-86/+113
| * | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-031-3/+9
| |\ \ | | |/
| | * Cleanup fix for WL#5154 that splits commands handling forMagne Mahre2010-02-021-3/+9
| * | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-6/+36
| |\ \ | | |/
| | * WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-01-271-5/+35
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-3/+26
| |\ \
* | \ \ 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
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge mysql-next-mr-marc --> mysql-next-mr-bugfixingMarc Alff2010-02-051-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marcMarc Alff2010-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marcMarc Alff2010-01-271-15/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |