summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1thek@kpdesk.mysql.com2008-04-141-1/+1
|\
| * Bug#34183 Missing DBUG_RETURN in alloc_rootthek@adventure.(none)2008-04-071-1/+1
* | Merge bk-internal:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-3123-226/+477
|\ \
| * | Makefile.am:gkodinov/kgeorge@magare.gmz2008-03-281-1/+1
| * | Fixed problem with non-synchronous error listsgkodinov/kgeorge@magare.gmz2008-03-282-42/+77
| * | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-2821-225/+441
| |\ \ | | |/ | |/|
| | * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-131-3/+17
| | |\
| | * \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-0721-225/+441
| | |\ \
| | | * \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2008-02-2721-225/+441
| | | |\ \
| | | | * | Reverted wrong patch, fix for Windows 32bit build.jani@hynda.mysql.fi2008-02-261-1/+1
| | | | * | Added a missing cast.jani@hynda.mysql.fi2008-02-181-1/+1
| | | | * | Fixed a previous patch.jani@hynda.mysql.fi2008-02-181-24/+10
| | | | * | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-121-1/+2
| | | | |\ \
| | | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-0821-210/+440
| | | | |\ \ \
| | | | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2007-12-0721-210/+440
| | | | | |\ \ \
| | | | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-2621-210/+440
| | | | | | |\ \ \
| | | | | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-141-1/+10
| | | | | | | |\ \ \
| | | | | | | * | | | Fixed problem in my_micro_time_and_time().jani@hynda.mysql.fi2007-11-081-2/+9
| | | | | | | * | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-0821-208/+431
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Fixed a typo.jani@hynda.mysql.fi2007-10-301-2/+2
| | | | | | | | * | | | Fix for counting query time for Windows.jani@hynda.mysql.fi2007-10-291-17/+23
| | | | | | | | * | | | Fixes to merge between 5.1-main and 5.1-marveljani@hynda.mysql.fi2007-10-152-0/+2
| | | | | | | | * | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1monty@mysql.com/narttu.mysql.fi2007-10-1120-191/+406
* | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-281-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bug#35272: @@global.key_buffer_size = 4294967295 let the server crashdavi@mysql.com/endora.local2008-03-251-1/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainistruewing@stella.local2008-03-261-1/+4
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Manual mergeistruewing@stella.local2008-03-141-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...antony@pcg5ppc.xiphis.org2008-03-071-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainistruewing@stella.local2008-02-141-1/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginessvoj@june.mysql.com2008-01-241-1/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | BUG#28884 - maybe a problem with malloc into base64.csvoj@mysql.com/june.mysql.com2008-01-151-1/+4
* | | | | | | | | | | | Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimethek@adventure.(none)2008-03-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bug#25175 Too much memory used by MySQL grant systemthek@adventure.(none)2008-03-181-2/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge kaamos.(none):/data/src/mysql-5.1kaa@kaamos.(none)2008-03-121-3/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge kaamos.(none):/data/src/opt/bug31781/my51kaa@kaamos.(none)2008-03-031-3/+17
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge kaamos.(none):/data/src/opt/bug31781/my50kaa@kaamos.(none)2008-03-031-3/+17
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Fix for bug #31781: multi-table UPDATE with temp-pool enabled fails kaa@kaamos.(none)2008-03-031-3/+17
| | | * | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opttnurnberg@white.intern.koehntopp.de2007-12-171-2/+2
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@eagle.(none)2007-12-131-48/+127
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opttnurnberg@white.intern.koehntopp.de2007-12-061-1/+1
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Bug#31177: Server variables can't be set to their current valuestnurnberg@mysql.com/white.intern.koehntopp.de2007-12-061-2/+0
| | | | | * | | | | | | | | Bug#31177: Server variables can't be set to their current valuestnurnberg@mysql.com/white.intern.koehntopp.de2007-12-031-1/+3
| | | | * | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opttnurnberg@white.intern.koehntopp.de2007-12-021-48/+127
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | * | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0tsmith@ramayana.hindu.god2007-12-046-66/+251
| | | |\ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ Merge quad.:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@quad.2008-02-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bug#34424 query_cache_debug.test leads to valgrind warningsdavi@mysql.com/endora.local2008-02-261-0/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | fixes for build failures due to my yesterday's changeset forbiddingguilhem@gbichot4.local2008-02-191-1/+1
* | | | | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-buildguilhem@gbichot4.local2008-02-184-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>guilhem@gbichot4.local2008-02-184-14/+14
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Bug#30331 Table_locks_waited shows inaccurate valuesdavi@mysql.com/endora.local2008-01-281-1/+2
|/ / / / / / / / / / / /