summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-1/+0
|\
| * Merge from mysql-5.1.Alexander Nozdrin2009-10-191-1/+0
| |\
| | * Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clashMagnus BlÄudd2009-10-061-1/+0
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-143-9/+13
|\ \ \ | |/ /
| * | Merge from mysql-5.1.Alexander Nozdrin2009-10-133-9/+13
| |\ \ | | |/
| | * WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+10
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-3/+3
| | * Merge from 5.0Staale Smedseng2009-09-171-6/+0
| | |\
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-6/+0
| | | * Bug#17332 - changing key_buffer_size on a running serverIngo Struewing2009-09-071-0/+6
* | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-084-36/+16
|\ \ \ \
| * \ \ \ Merge from mysq-next-mr-wtf.Alexander Nozdrin2009-10-023-36/+14
| |\ \ \ \
| | * | | | backport of Vladislav Vaintroub2009-09-302-8/+3
| | * | | | Backport of this changeset Vladislav Vaintroub2009-09-302-7/+8
| | * | | | Windows improvements : manual backport of Vladislav Vaintroub2009-09-301-21/+3
| * | | | | Backporting WL#3759 Optimize identifier conversion in client-server protocolAlexander Barkov2009-09-301-0/+2
| |/ / / /
* | | | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-301-3/+5
|/ / / /
* | | | merge mysql-next-mr-alikVladislav Vaintroub2009-09-241-11/+20
|\ \ \ \
| * \ \ \ Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-173-4/+68
| |\ \ \ \ | | |/ / /
| * | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-11/+20
* | | | | mergeVladislav Vaintroub2009-09-233-4/+68
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-163-4/+68
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Add DBUG_VIOLATION_HELPER_LEAVE definition to non-debug build.Alexander Nozdrin2009-09-101-0/+1
| | * | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-4/+47
| | * | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-09-031-0/+1
| | |\ \ | | | |/
| | | * Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabled for Satya B2009-09-031-0/+1
| | * | Merge from 5.0 for 43414Staale Smedseng2009-08-281-0/+19
| | |\ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-0/+13
* | | | This is the downport ofVladislav Vaintroub2009-09-114-12/+60
|/ / /
* | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-125-13/+16
|\ \ \ | |/ /
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-114-10/+33
| |\ \
| * \ \ Auto-mergeIgnacio Galarza2009-07-312-2/+4
| |\ \ \ | | | |/ | | |/|
| | * | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-312-2/+4
| * | | Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-301-0/+1
| * | | merge 5.0-bugteam to 5.1-bugteamSatya B2009-07-241-1/+2
| |\ \ \ | | |/ /
| | * | merge to mysql-5.0-bugteamSatya B2009-07-241-1/+9
| | |\ \
| | * | | Fix for BUG#18828 - If InnoDB runs out of undo slots, Satya B2009-07-171-1/+2
| * | | | Merge from 5.0Staale Smedseng2009-07-231-1/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug #45770 errors reading server SSL files are printed, butStaale Smedseng2009-07-231-1/+9
| | |/ /
| | * | Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-161-1/+1
| * | | automergeGeorgi Kodinov2009-07-161-9/+0
| |\ \ \ | | |/ /
| | * | Bug #45287: phase 1 : 32 bit compilation warningsGeorgi Kodinov2009-07-151-9/+0
* | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-047-15/+40
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-144-4/+5
| |\ \ \ | | |/ /
| | * | Automerge.Alexey Kopytov2009-07-121-1/+2
| | |\ \
| | | * | Bug #45796: invalid memory reads and writes when altering merge Alexey Kopytov2009-07-101-1/+2
| | * | | Bug #43397 mysql headers redefine pthread_mutex_initStaale Smedseng2009-07-081-1/+1
| | |/ /
| | * | merging with mysql-5.0-bugteamV Narayanan2009-06-191-1/+1
| | |\ \ | | | |/
| | | * Bug#43572 Handle failures from hash_initV Narayanan2009-06-191-1/+1
| | | * MySQL 5.0 backport of Chad Miller's patch for Bug#34309:Davi Arnaut2009-05-301-1/+0