summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merged with mysql-5.1 tree.Michael Widenius2009-04-252-4/+4
|\
| * auto-mergeIgnacio Galarza2009-03-191-1/+1
| |\
| | * Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-271-1/+1
| * | auto-mergeIgnacio Galarza2009-03-171-1/+12
| |\ \ | | |/
| * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-132-3/+3
| |\ \
| | * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-102-3/+3
* | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-1/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug#42146 - DATETIME fractional seconds parse errorTatiana A. Nurnberg2009-02-131-1/+12
| |/ /
* | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-6/+7
|\ \ \ | |/ /
| * | auto-mergeTatiana A. Nurnberg2009-01-091-6/+7
| |\ \ | | |/
| | * Bug#41470: DATE_FORMAT() crashes the complete server with a valid dateTatiana A. Nurnberg2009-01-081-6/+7
| | * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294unknown2008-04-031-3/+3
| | |\
| | * | fixed warnings and compile errors from the fix for bug 26243unknown2008-03-291-1/+1
| | * | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0unknown2008-03-181-3/+7
| | |\ \
* | | \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294unknown2008-04-031-3/+3
| |\ \ \ \
| | * \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294unknown2008-04-031-3/+3
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3unknown2008-04-031-3/+3
| | | |/ /
* | | | | wt_thd_lazy_init(), per-thread deadlock search depths and timeoutsSergei Golubchik2008-08-081-1/+1
|/ / / /
* | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1unknown2008-03-181-4/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Merge buzz.(none):/home/davi/mysql-5.0-runtimeunknown2008-03-171-3/+7
| |\ \ \ | | | |/ | | |/|
| | * | Bug#35103 mysql_client_test::test_bug29948 causes sporadic failuresunknown2008-03-141-3/+7
| * | | A fix for Bug#35289: Too many connections -- wrong SQL stateunknown2008-03-141-1/+17
* | | | Merge kaamos.(none):/data/src/mysql-5.1unknown2008-03-121-7/+21
|\ \ \ \ | |/ / / |/| | |
| * | | Merge bk@192.168.21.1:mysql-5.1-optunknown2008-02-271-7/+21
| |\ \ \
| | * \ \ Merge mysql.com:/home/hf/work/25097/my50-25097unknown2008-02-271-7/+21
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.unknown2008-02-271-6/+21
| | | |/
| | | * Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2007-12-131-1/+8
| | | |\
| | | | * Merge mysql.com:/misc/mysql/mysql-5.0-optunknown2007-11-171-1/+8
| | | | |\
* | | | | | Bug#34655 Compile errorunknown2008-02-281-30/+30
* | | | | | Fix for Bug#29605unknown2008-02-221-1/+9
|/ / / / /
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-02-081-1/+7
|\ \ \ \ \
| * | | | | Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitutionunknown2008-02-071-1/+7
| |/ / / /
* | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rplunknown2008-01-301-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Post-merge changes.unknown2008-01-301-2/+2
* | | | | Merge station.:/mnt/raid/alik/MySQL/devel/5.1unknown2007-12-141-1/+8
|\ \ \ \ \
| * \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-12-131-1/+8
| |\ \ \ \ \
| | * \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-12-011-1/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge mysql.com:/misc/mysql/mysql-5.1-optunknown2007-11-171-1/+8
| | | |\ \ \ \
| | | | * \ \ \ Merge mysql.com:/misc/mysql/32180/50-32180unknown2007-11-171-1/+8
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | Bug #32180: DATE_ADD treats datetime numeric argument as DATE instead of DATE...unknown2007-11-161-1/+8
* | | | | | | | Bug#12713 "Error in a stored function called from a SELECT doesn't unknown2007-12-121-36/+38
|/ / / / / / /
* | | | | | | Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtimeunknown2007-11-281-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge pilot.mysql.com:/data/msvensson/mysql/bug32429/my50-bug32429unknown2007-11-261-0/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Bug#32429 ssl_cipher setting in my.cnf not read by libmysqlclientunknown2007-11-161-0/+5
| | | |_|/ | | |/| |
* | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-11-141-17/+17
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge mysql.com:/misc/mysql/31800/50-31800unknown2007-11-101-17/+17
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Bug#31800: Date comparison fails with timezone and slashes for greater than c...unknown2007-11-101-17/+17
| | * | Bug#30951: makedate returns different results depending on version of mysqlunknown2007-10-121-5/+0
| | |/
* | | Another attempt to fix the Windows compilation failre.unknown2007-11-011-3/+3