summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-071-6/+21
|\
| * Bug#49417 some complaints about mysqld --help --verbose outputStaale Smedseng2010-03-011-6/+20
| * merging from 5.1 rep to a local branchAndrei Elkin2010-02-261-0/+1
| |\
| | * Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2010-02-261-0/+1
| * | Bug #51089 SHOW STATUS LIKE 'Slave_running' is not compatible with `SHOW SL...Andrei Elkin2010-02-251-1/+2
| |/
* | 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
| * fix a windows test run bug with debug binaries : dbug frame Georgi Kodinov2010-01-261-1/+1
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-3/+26
|\ \ | |/
| * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-2/+20
| * BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-201-1/+6
* | 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
* | | 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.Alexander Nozdrin2009-12-111-196/+211
|\ \ \
| * \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-10/+18
| |\ \ \
| * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-1/+1
| |\ \ \ \
| * \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-12/+4
| |\ \ \ \ \
| | * | | | | Bug#38968 Unused mutex LOCK_bytes_sent, LOCK_bytes_receivedMarc Alff2009-10-291-5/+1
| | * | | | | Bug#38967 Unused mutex LOCK_AclMarc Alff2009-10-291-3/+1
| | * | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-13/+96
| | |\ \ \ \ \
| | * \ \ \ \ \ automergeSergey Glukhov2009-10-231-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Backport of patch for Bug#46267.Alexander Nozdrin2009-10-231-1/+1
| | * | | | | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to BetonySergey Glukhov2009-10-231-1/+0
| | |/ / / / / /
| | * | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-221-38/+112
| | |\ \ \ \ \ \
| | * | | | | | | Bug #48047 Can't do normal shutdown Vladislav Vaintroub2009-10-151-2/+1
| * | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-13/+96
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-13/+96
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Manual merge semi-sync to 5.1-rep+2He Zhenxing2009-10-031-0/+10
| | | |\ \ \ \ \ \
| | | | * | | | | | Backporting WL#4398 WL#1720He Zhenxing2009-09-261-0/+10
| | | * | | | | | | merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixesAndrei Elkin2009-10-011-13/+50
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Automerge: mysql-5.1-rep+2 (local backports) --> mysql-5.1-rep+2 (local latest)Luis Soares2009-09-301-4/+6
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | BUG#42928: binlog-format setting prevents server from start if binaryLuis Soares2009-09-291-3/+4
| | | | | * | | | | | | Bug #30703 SHOW STATUS LIKE 'Slave_running' is not compatible with `SHOW SLAVELuis Soares2009-09-291-1/+2
| | | | * | | | | | | | BUG#40337 Fsyncing master and relay log to disk after every event is too slowAlfranio Correia2009-09-291-2/+24
| | | | * | | | | | | | BUG#35542 Add option to sync master and relay log to disk after every eventAlfranio Correia2009-09-291-4/+11
| | | | * | | | | | | | BUG#44663 Unused replication options prevent server from starting.Alfranio Correia2009-09-291-5/+10
| | | | |/ / / / / / /
| | | | * | | | | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay logLuis Soares2009-09-291-0/+1
| | | | |/ / / / / /
| | | * | | | | | | WL#342 heartbeatAndrei Elkin2009-09-291-0/+36
| | | |/ / / / / /