summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+6
|\
| * WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+6
* | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+5
* | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-2/+0
* | Backport of the patch Vladislav Vaintroub2009-09-301-1/+1
* | Windows improvements : manual backport of Vladislav Vaintroub2009-09-301-17/+1
* | mergeVladislav Vaintroub2009-09-231-2/+1
|\ \
| * \ Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-161-2/+1
| |\ \ | | |/
| | * Merge from 5.0 for 43414Staale Smedseng2009-08-281-2/+1
| | |\
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-2/+1
* | | | This is the downport ofVladislav Vaintroub2009-09-111-1/+1
|/ / /
* | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-1/+1
|\ \ \ | |/ /
| * | Auto-mergeIgnacio Galarza2009-07-311-1/+1
| |\ \ | | |/
| | * Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-311-1/+1
| | * auto-mergeIgnacio Galarza2009-03-191-2/+2
| | |\
* | | \ Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-2/+2
|\ \ \ \ | |/ / /
| * | | Bug #43397 mysql headers redefine pthread_mutex_initStaale Smedseng2009-07-081-2/+2
* | | | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-111-5/+5
|\ \ \ \ | |/ / /
| * | | auto-mergeIgnacio Galarza2009-03-171-2/+2
| |\ \ \
| | * \ \ Merge into dev tree.Alexey Kopytov2009-02-101-2/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix for bug #21205: Different number of digits for float/double/real in --ps-...Alexey Kopytov2009-01-281-2/+2
| * | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-3/+3
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-102-5/+5
| | |/
| | * Bug#37226 Explicit call of my_thread_init() on Windows for every new thread.Vladislav Vaintroub2008-09-011-1/+12
| | * fixed warnings and compile errors from the fix for bug 26243gkodinov/kgeorge@macbook.gmz2008-03-291-1/+1
| | * Merge amd64.(none):/src/mysql-5.0-bugteamiggy@amd64.(none)2008-03-281-4/+0
| | |\
| | | * Bug#26243 mysql command line crash after control-ciggy@amd64.(none)2008-03-281-4/+0
| | * | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0anozdrin/alik@quad.opbmk2008-03-181-5/+12
| | |\ \ | | | |/ | | |/|
* | | | Merge dtrace patch with latest performance versionMikael Ronstrom2008-12-201-3/+1
|\ \ \ \ | |/ / /
| * | | Bug#38522: 5 seconds delay when closing application using embedded serverVladislav Vaintroub2008-12-041-3/+1
* | | | Backport of DTrace patches from 6.0Mikael Ronstrom2008-12-201-1/+2
|/ / /
* | | Bug#37226 Explicit call of my_thread_init() on Windows for every new thread.Vladislav Vaintroub2008-09-011-1/+12
* | | Bug#27430 "Crash in subquery code when in PS and table DDL changed afterkostja@bodhi.(none)2008-05-202-43/+91
* | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-282-2/+2
|\ \ \
| * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-131-1/+1
| |\ \ \
| * \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-072-2/+2
| |\ \ \ \
| | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2008-02-272-2/+2
| | |\ \ \ \
| | | * \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-082-2/+2
| | | |\ \ \ \
| | | | * \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2007-12-072-2/+2
| | | | |\ \ \ \
| | | | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-262-2/+2
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-082-2/+2
| | | | | | |\ \ \ \
| | | | | | | * | | | Fixes to merge between 5.1-main and 5.1-marveljani@hynda.mysql.fi2007-10-161-1/+1
| | | | | | | * | | | 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-1/+1
* | | | | | | | | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@quad.opbmk2008-03-181-5/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Post-merge fixes for Bug 35103davi@buzz.(none)2008-03-171-1/+1
| * | | | | | | | | | Merge buzz.(none):/home/davi/mysql-5.0-runtimedavi@buzz.(none)2008-03-171-5/+12
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Bug#35103 mysql_client_test::test_bug29948 causes sporadic failuresdavi@mysql.com/endora.local2008-03-141-5/+12
* | | | | | | | | | Merge kaamos.(none):/data/src/mysql-5.1kaa@kaamos.(none)2008-03-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge mysql.com:/home/hf/work/25097/my50-25097holyfoot/hf@hfmain.(none)2008-02-271-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.holyfoot/hf@mysql.com/hfmain.(none)2008-02-271-1/+1
| | |/ / / / / /