summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-92/+142
|\
| * Bug#36540: CREATE EVENT and ALTER EVENT statements fail with large server_idDavi Arnaut2009-03-111-1/+1
| * Bug#42790 Test 'main.innodb' fails from "InnoDB: Error: in ALTER TABLE"Narayanan V2009-03-051-0/+4
| * Automerge.Alexey Kopytov2009-02-251-3/+0
| |\
| | * Automerge.Alexey Kopytov2009-02-251-3/+0
| | |\
| | | * Fixed a build failure on Ubuntu 8.10 introduced by the patchAlexey Kopytov2009-02-251-3/+0
| * | | merging.Alexey Botchkov2009-02-241-54/+85
| |\ \ \ | | |/ / | |/| |
| | * | Bug#39289 libmysqld.a calls exit() upon error Alexey Botchkov2008-10-271-64/+99
| * | | Manual merge to 5.1.Alexey Kopytov2009-02-231-25/+30
| |\ \ \ | | | |/ | | |/|
| | * | Fix for bug #15936: "round" differs on Windows to UnixAlexey Kopytov2009-02-231-23/+28
| * | | Bug#41077: Warning contains wrong future versionDavi Arnaut2009-02-161-1/+1
| * | | Merge from bug tree.Chad MILLER2009-02-111-9/+22
| |\ \ \
| | * | | Bug#30261: "mysqld --help" no longer possible for rootChad MILLER2009-02-101-9/+22
* | | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-2/+10
|\ \ \ \ \ | |/ / / /
| * | | | Bug#42610 Dynamic plugin broken in 5.1.31Sergey Glukhov2009-02-091-2/+10
* | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-2/+63
|\ \ \ \ \ | |/ / / /
| * | | | Bug#31177: Server variables can't be set to their current valuesTatiana A. Nurnberg2009-01-121-1/+1
| * | | | fix misspellingVladislav Vaintroub2009-01-071-1/+1
| * | | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-051-1/+1
| |\ \ \ \
| | * \ \ \ Merge main 5.1 into 5.1-buildJoerg Bruehe2008-12-101-34/+28
| | |\ \ \ \
| | * \ \ \ \ Merge from mysql-5.1.30-releaseunknown2008-11-271-1/+1
| | |\ \ \ \ \
| | | * | | | | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
| * | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-12-291-0/+9
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Bug#41131 "Questions" fails to increment - ignores statements instead stored ...Sergey Glukhov2008-12-291-0/+1
| * | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-12-241-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | compiler warning fixSergey Glukhov2008-12-241-1/+1
| * | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-12-231-0/+42
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#37575 UCASE fails on monthnameSergey Glukhov2008-12-231-0/+42
| * | | | | | | Bug#24289 Status Variable "Questions" gets wrong values with Stored Routines(...Sergey Glukhov2008-12-171-7/+1
| * | | | | | | Bug#39750 -cannot create temp file on Windows.Vladislav Vaintroub2008-12-051-0/+16
| | |_|_|/ / / | |/| | | | |
* | | | | | | post-review fixesSergei Golubchik2009-01-151-4/+3
* | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-158/+286
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge with base Maria treeMichael Widenius2008-12-091-6/+6
| * | | | | | Fixed warnings and errors discovered by pushbuild2Michael Widenius2008-12-041-1/+1
| * | | | | | Merge with base MySQL-5.1-mariaMichael Widenius2008-12-031-35/+60
| |\ \ \ \ \ \
| | * | | | | | Fix of the small merge bug.unknown2008-11-251-1/+2
| | * | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-35/+59
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| * | | | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de...Michael Widenius2008-12-031-4/+51
| * | | | | | | Remove not used signal handling for ending a threadMichael Widenius2008-12-021-25/+13
| |/ / / / / /
| * | | | | | Fix for bug#39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TA...Michael Widenius2008-10-121-0/+3
| * | | | | | Merged 5.1 maria with 5.1 maria team tree. Automerge.Michael Widenius2008-10-111-2/+2
| |\ \ \ \ \ \
| | * | | | | | Bug#39392: Maria: if INSERT in UNIQUE finds uncommitted same key, error inste...Sergei Golubchik2008-09-111-2/+2
| * | | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-14/+36
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | wt: comments, OOM checks, test case for deadlock detectionSergei Golubchik2008-08-281-4/+4
| * | | | | | | proc_info_hook, mysys access to thd->proc_infoSergei Golubchik2008-08-271-0/+3
| * | | | | | | wt_thd_lazy_init(), per-thread deadlock search depths and timeoutsSergei Golubchik2008-08-081-1/+25
| * | | | | | | move wt* maintainance from maria to the serverSergei Golubchik2008-08-071-0/+4
| * | | | | | | Fix for BUG#36104 "INFORMATION_SCHEMA.TABLES shows TRANSACTIONAL=1 twice in C...Guilhem Bichot2008-06-031-1/+0
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-05-291-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"unknown2008-05-291-1/+1