summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ /
* | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-38/+112
|\ \ \ \ | |/ / /
| * | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-26/+45
| |\ \ \
| | * | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-26/+45
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-8/+66
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-8/+66
| | |\ \ \
| | | * | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-1/+45
| | | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-1/+2
| | | * | | A patch for Bug#47474 (mysqld hits Dbug_violation_helper assertAlexander Nozdrin2009-09-231-5/+18
| | | * | | automergeGeorgi Kodinov2009-09-181-10/+9
| | | |\ \ \ | | | | |/ /
| | | | * | first merge from mainBjorn Munch2009-09-021-19/+54
| | | | |\ \
| | | * | \ \ automergeGeorgi Kodinov2009-09-181-1/+1
| | | |\ \ \ \
| | | | * | | | Bug #46917: mysqd-nt installs wrongGeorgi Kodinov2009-09-171-1/+1
| * | | | | | | Backport WL#4085: Merge revno:2617.56.29 from 6.0.Alexander Nozdrin2009-10-061-4/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Backport of:Konstantin Osipov2009-10-141-10/+11
* | | | | | | Backport of:Konstantin Osipov2009-10-141-4/+0
* | | | | | | Bug #33693 general log name and location depend on PID file, Magne Mahre2009-10-121-2/+6
* | | | | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-9/+7
* | | | | | | Backport to 5.4 the following changesets:Konstantin Osipov2009-10-091-3/+0
|/ / / / / /
* | | | | | backport of Vladislav Vaintroub2009-09-301-12/+8
* | | | | | Backport of this changeset Vladislav Vaintroub2009-09-301-40/+20
* | | | | | Merge mysql-next-mr (revno 2882) --> mysql-trunk-signalMarc Alff2009-09-221-10/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | new merge from trunkBjorn Munch2009-09-181-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ initial merge from 5.1-mtrBjorn Munch2009-09-041-10/+9
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug #46212 safe_process: FATAL ERROR, Unknown option: --nocoreBjorn Munch2009-07-231-10/+9
* | | | | | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-171-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-161-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-2/+2
| | | |_|/ | | |/| |
* | | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-65/+17
|/ / / /