summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Up-merge 5.0.66a-release changes (via 5.0) into 5.1.Timothy Smith2008-07-172-27/+57
|\
| * Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnfTimothy Smith2008-07-162-26/+56
| * fixed a compilation warning on windows 64.Georgi Kodinov2008-07-091-1/+1
* | Up-merge syntax fix from 5.0-bugteam.Timothy Smith2008-07-021-1/+3
|\ \ | |/
| * Fix "C++ code in C file" syntax error in mysys/default.cTimothy Smith2008-07-021-1/+3
* | Up-merge from 5.0: Fix for Bug#20748, Configuration files should not be read ...Timothy Smith2008-06-271-136/+130
|\ \ | |/
| * Bug #20748: Configuration files should not be read more than onceTimothy Smith2008-06-241-155/+129
| * Fix for Bug#16902.Hakan Kuecuekyilmaz2008-06-161-1/+1
| * revert the push of bug 35616.unknown2008-05-062-3/+3
| * Bug#35616: memory overrun on 64-bit linux on setting large values for keybuff...unknown2008-05-062-3/+3
| * Avoid compilation problem on AIX.unknown2008-04-281-2/+1
| * fixed warnings from the fix of 26243unknown2008-03-291-1/+1
* | Silence unused variable warning by printing the variables value.Davi Arnaut2008-06-191-0/+2
* | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-191-56/+56
* | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-183-2/+584
* | Fix for Bug#16902.Hakan Kuecuekyilmaz2008-06-161-1/+1
* | Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1unknown2008-04-141-1/+1
|\ \
| * | Bug#34183 Missing DBUG_RETURN in alloc_rootunknown2008-04-071-1/+1
* | | Merge bk-internal:/home/bk/mysql-5.1unknown2008-03-3123-226/+477
|\ \ \
| * | | Makefile.am:unknown2008-03-281-1/+1
| * | | Fixed problem with non-synchronous error listsunknown2008-03-282-42/+77
| * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-2821-225/+441
| |\ \ \ | | |/ / | |/| |
| | * | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-131-3/+17
| | |\ \
| | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-0721-225/+441
| | |\ \ \
| | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-2721-225/+441
| | | |\ \ \
| | | | * | | Reverted wrong patch, fix for Windows 32bit build.unknown2008-02-261-1/+1
| | | | * | | Added a missing cast.unknown2008-02-181-1/+1
| | | | * | | Fixed a previous patch.unknown2008-02-181-24/+10
| | | | * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-121-1/+2
| | | | |\ \ \
| | | | * \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-0821-210/+440
| | | | |\ \ \ \
| | | | | * \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-0721-210/+440
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-2621-210/+440
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-141-1/+10
| | | | | | | |\ \ \ \
| | | | | | | * | | | | Fixed problem in my_micro_time_and_time().unknown2007-11-081-2/+9
| | | | | | | * | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-0821-208/+431
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | Fixed a typo.unknown2007-10-301-2/+2
| | | | | | | | * | | | | Fix for counting query time for Windows.unknown2007-10-291-17/+23
| | | | | | | | * | | | | Fixes to merge between 5.1-main and 5.1-marvelunknown2007-10-152-0/+2
| | | | | | | | * | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-1120-191/+406
* | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-03-281-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Bug#35272: @@global.key_buffer_size = 4294967295 let the server crashunknown2008-03-251-1/+3
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainunknown2008-03-261-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Manual mergeunknown2008-03-141-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...unknown2008-03-071-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainunknown2008-02-141-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2008-01-241-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | BUG#28884 - maybe a problem with malloc into base64.cunknown2008-01-151-1/+4
* | | | | | | | | | | | | Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2008-03-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Bug#25175 Too much memory used by MySQL grant systemunknown2008-03-181-2/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge kaamos.(none):/data/src/mysql-5.1unknown2008-03-121-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |