summaryrefslogtreecommitdiff
path: root/include/my_global.h
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \
| | * \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-081-0/+12
| | |\ \ \ \
| | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-081-0/+12
| | | |\ \ \ \
| | | | * | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-0/+12
* | | | | | | | Merge mysql.com:/misc/mysql/mysql-5.1unknown2008-03-271-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-optunknown2008-03-211-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)unknown2008-03-211-1/+1
* | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-141-6/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge kaamos.(none):/data/src/mysql-5.1unknown2008-03-121-6/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix for bug #31236: Inconsistent division by zero behavior for unknown2008-02-201-6/+7
| | | |/ / / / | | |/| | | |
* | | | | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugsunknown2008-02-281-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Bug #24992 Enabling Shared Memory support on Windows x64 causes client to failunknown2008-02-281-2/+2
* | | | | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugsunknown2008-02-271-6/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Bug #23839 Multiple declarations of macrosunknown2008-02-271-6/+5
| | |/ / / | |/| | |
* | | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>unknown2008-02-181-0/+4
| |/ / / |/| | |
* | | | Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-buildunknown2007-11-301-47/+25
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-buildunknown2007-11-301-47/+25
| |\ \ \
| | * | | my_global.h:unknown2007-11-301-30/+25
| | * | | Excluded verbose and bad change to Mac OS X universal binaries handlingunknown2007-11-301-18/+1
* | | | | Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-buildunknown2007-11-291-1/+18
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-buildunknown2007-11-291-1/+18
| |\ \ \ | | |/ /
| | * | my_global.h:unknown2007-11-291-1/+18
* | | | Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254unknown2007-10-121-0/+5
|\ \ \ \ | |/ / /
| * | | Fix for bug #31254: "Max_data_length" truncated / reported wrongunknown2007-10-121-0/+5
* | | | Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731unknown2007-10-021-2/+2
|\ \ \ \ | |_|_|/ |/| | |