summaryrefslogtreecommitdiff
path: root/include/my_sys.h
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-1/+1
|\
| * Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSXGeorgi Kodinov2009-06-051-1/+1
* | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-4/+4
|/
* Manual merge of patch for bug #40552 into the team tree.Alexey Kopytov2009-03-161-2/+5
|\
| * Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-271-2/+5
* | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteamHe Zhenxing2009-03-061-0/+1
|\ \ | |/ |/|
| * BUG#22082 Slave hangs(holds mutex) on "disk full"He Zhenxing2009-03-061-0/+1
* | Bug#37995 Error message truncation in test "innodb" in embedded mode.Alexey Botchkov2009-02-051-3/+0
* | mergingAlexey Botchkov2008-08-231-0/+1
|\ \ | |/
| * Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.Alexey Botchkov2008-08-221-0/+1
* | Fix merge problem: make sf_malloc_cur_memory definitions match in headers and...Sergey Petrunia2008-08-201-1/+1
* | Up-merge 5.0.66a-release changes (via 5.0) into 5.1.Timothy Smith2008-07-171-0/+1
|\ \ | |/
| * Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnfTimothy Smith2008-07-161-0/+1
| * Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplmkindahl@dl145h.mysql.com2008-01-301-0/+6
| |\
| * \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0tsmith@ramayana.hindu.god2007-12-041-0/+4
| |\ \
| | * \ Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-11-141-0/+2
| | |\ \
| | | * \ Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-enginessvoj@june.mysql.com2007-10-241-0/+2
| | | |\ \
| | | | * | BUG#31159 - fulltext search on ucs2 column crashes serversvoj@mysql.com/june.mysql.com2007-10-241-0/+2
| | * | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50tsmith@ramayana.hindu.god2007-11-071-0/+2
| | |\ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Implement some code review fixes for the fix for Bug#27430 kostja@bodhi.(none)2008-05-181-0/+3
* | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2008-02-271-8/+17
|\ \ \ \ \ \
| * \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-081-8/+17
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-261-8/+17
| | |\ \ \ \ \ \
| | | * | | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1monty@mysql.com/narttu.mysql.fi2007-10-111-8/+17
* | | | | | | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>guilhem@gbichot4.local2008-02-181-6/+6
|/ / / / / / / /
* | | | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rplmkindahl@dl145h.mysql.com2008-01-301-0/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplmkindahl@dl145h.mysql.com2008-01-301-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | BUG#30435 loading large LOAD DATA INFILE breaks slave with aelkin/elkin@koti.dsl.inet.fi2007-12-211-0/+6
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-12-051-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Post-merge changes for bug #31207: Test "join_nested" shows different strateg...kaa@polly.(none)2007-10-181-1/+1
| * | | | | | Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maintkaa@polly.(none)2007-10-181-2/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Fix for bug #31207: Test "join_nested" shows different strategy on IA64kaa@polly.(none)2007-10-171-2/+4
| | |/ / /
| | * | | Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platf...kaa@polly.local2007-08-291-13/+13
* | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50tsmith@ramayana.hindu.god2007-11-071-0/+2
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Bug #20748: Configuration files should not be read more than oncetsmith@ramayana.hindu.god2007-11-071-0/+2
| |/ /
* | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarismonty@mysql.com/nosik.monty.fi2007-08-131-0/+1
* | | Fixes Bug#30127: --debug-info no longer prints memory usage in mysqlmonty@mysql.com/nosik.monty.fi2007-08-011-2/+2
* | | Slow query log to file now displays queries with microsecond precissionmonty@mysql.com/nosik.monty.fi2007-07-301-1/+5
* | | Patch for the following bugs:anozdrin/alik@ibm.2007-06-281-6/+6
* | | This the 4-th patch in scope of CS patch (BUG#11986).anozdrin/alik@ibm.2007-06-141-0/+8
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@linux-th5m.site2007-05-241-138/+139
|\ \ \
| * \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-138/+139
| |\ \ \
| | * | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-138/+139
* | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-enginessvoj@june.mysql.com2007-05-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Addition to fix forsvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-enginesistruewing@chilla.local2006-10-111-8/+14
| | |\ \
* | | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-04-271-2/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@sergbook.mysql.com2007-04-161-2/+9
| |\ \ \ \
| | * | | | WL#2936antony@ppcg5.local2007-03-021-2/+9
View Lorry Controller Status