summaryrefslogtreecommitdiff
path: root/include/my_global.h
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-171-1/+1
|\
| * Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-171-1/+1
| |\
| | * merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-171-1/+1
| | |\
| | | * Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-171-0/+3
* | | | MergeMikael Ronstrom2009-12-141-1/+11
|\ \ \ \
| * | | | WL#2360 Performance schemaMarc Alff2009-11-301-1/+11
* | | | | Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-11/+0
|\ \ \ \ \ | |/ / / /
| * | | | Backport of:Konstantin Osipov2009-11-241-11/+0
| |/ / /
* | | | WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-201-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-121-0/+2
* | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-2/+2
* | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-0/+1
|\ \ \ \
| * | | | A postfix for WL#751Alexander Barkov2009-10-161-0/+1
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-6/+0
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge from 5.0Staale Smedseng2009-09-171-6/+0
| |\ \ \ | | | |/ | | |/|
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-6/+0
* | | | mergeVladislav Vaintroub2009-09-231-0/+19
|\ \ \ \ | |/ / /
| * | | Merge from 5.0 for 43414Staale Smedseng2009-08-281-0/+19
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-0/+13
| | * MySQL 5.0 backport of Chad Miller's patch for Bug#34309:Davi Arnaut2009-05-301-1/+0
* | | This is the downport ofVladislav Vaintroub2009-09-111-4/+37
|/ /
* | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-1/+1
|\ \
| * | Bug #43397 mysql headers redefine pthread_mutex_initStaale Smedseng2009-07-081-1/+1
* | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-0/+13
|/ /
* | merge -5.0 into -5.1 (minor conflicts resolved)Timothy Smith2009-04-011-34/+35
|\ \ | |/
| * auto-merge -build into -bugteamTimothy Smith2009-04-011-34/+35
| |\
| | * cmd-line-utils/libedit/readline/readline.hunknown2009-03-191-34/+35
| * | Automerge.Alexey Kopytov2009-03-251-2/+12
| |\ \ | | |/ | |/|
* | | Manual merge.Alexey Kopytov2009-03-251-3/+13
|\ \ \ | | |/ | |/|
| * | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can Alexey Kopytov2009-03-241-2/+12
* | | Automerge.Alexey Kopytov2009-02-251-0/+3
|\ \ \ | | |/ | |/|
| * | Fixed a build failure on Ubuntu 8.10 introduced by the patchAlexey Kopytov2009-02-251-0/+3
* | | Manual merge to 5.1.Alexey Kopytov2009-02-231-2/+33
|\ \ \ | |/ /
| * | Fix for bug #15936: "round" differs on Windows to UnixAlexey Kopytov2009-02-231-2/+33
| |/
* | Merge from bugteam team tree.Chad MILLER2009-02-101-1/+3
|\ \
| * | Bug#37995 Error message truncation in test "innodb" in embedded mode.Alexey Botchkov2009-02-051-1/+0
| * | merge: 5.1 -> 5.1-rplLuis Soares2009-01-231-0/+3
| |\ \
| * \ \ merge 5.1 --> 5.1-rplAlfranio Correia2008-12-131-5/+5
| |\ \ \
| * | | | Fixning compiler warnings. Fixing build failure for valgrind platform.Mats Kindahl2008-08-221-0/+3
* | | | | Bug#34309: '_PC' macro redefinitionChad MILLER2009-01-271-1/+0
| |_|/ / |/| | |
* | | | Merge from mysql-5.0-bugteam to mysql-5.1-bugteam.Alexey Kopytov2008-12-071-0/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fix for bug #27483: Casting 'scientific notation type' to 'unsigned Alexey Kopytov2008-12-031-0/+3
| * | Correct failing build.unknown2008-04-281-2/+6
| * | Merge mysql.com:/misc/mysql/mysql-5.0unknown2008-03-271-1/+1
| |\ \
* | | | Bug #35999 When using the embedded server a wrong message comes.Alexey Botchkov2008-06-161-5/+5
| |_|/ |/| |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-04-191-1/+1
|\ \ \
| * | | Tentative implementation ofunknown2008-04-081-1/+1
* | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-281-0/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-131-6/+7
| |\ \ \
| * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-271-0/+12
| |\ \ \ \