summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_5merge.result
Commit message (Expand)AuthorAgeFilesLines
* Merge with MySQL 5.1.52Michael Widenius2010-11-231-272/+272
|\
| * Bug #53296: LONG BLOB value types are not recognizedGeorgi Kodinov2010-08-161-272/+272
* | Added some changes inspired by Zardosht Kasheff:Michael Widenius2009-06-301-2/+2
* | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-4/+6
|\ \ | |/
| * Bug #39265: fix for the bug 33699 should be revertedGleb Shchepa2009-02-051-4/+6
* | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-2/+2
|\ \ | |/
| * Merge from 5.0-bugteam.Chad MILLER2008-08-151-2/+2
| |\
| | * Bug#37301 Length and Max_length differ with no obvious reason(2nd version)Chad MILLER2008-08-151-2/+2
| | * Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-061-16/+16
| | |\
| | | * Bug#31177: Server variables can't be set to their current valuesunknown2007-12-061-16/+16
* | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-6/+4
|\ \ \ \ | |/ / /
| * | | Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULLunknown2008-01-111-6/+4
* | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-071-2/+2
| |\ \ \
| | * \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-041-2/+2
| | |\ \ \
| | | * | | Fixed REPAIR/CHECK/ANALYZE TABLE for tables with new BLOCK-ROW format.unknown2007-07-011-2/+2
* | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B32400-5.0-optunknown2007-11-231-12/+12
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Bug #32400: Complex SELECT query returns correct result unknown2007-11-201-12/+12
| | |_|_|/ | |/| | |
* | | | | Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDSunknown2007-11-131-2/+2
* | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-optunknown2007-10-181-2/+4
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Bug #31221: Optimizer incorrectly identifies impossible WHERE clauseunknown2007-10-181-2/+4
* | | | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-07-021-2/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Follow up to the patch for the BUG#10491.unknown2007-06-291-2/+2
| * | backport of Bug#11491 Misleading error message if not NULL column set to NULL...unknown2007-05-301-2/+2
| * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-05-281-32/+32
| |\ \
| | * | Bug #28361 Buffer overflow in DECIMAL code on Windows unknown2007-05-211-32/+32
| * | | Backport of TIME->MYSQL_TIME / Y2K fixsetunknown2007-05-161-0/+14
| |/ /
* | | Post-merge fix.unknown2007-06-041-32/+32
* | | Bug#26277 User variable returns one type in SELECT @v and other for CREATE as...unknown2007-05-181-512/+512
* | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optunknown2007-04-291-4/+4
|\ \ \ | |/ /
| * | Bug#27590: Wrong DATE/DATETIME comparison.unknown2007-04-271-4/+4
* | | Removed not used define YY_MAGIC_BELOWunknown2007-03-231-0/+14
* | | Merge mysql.com:/home/tnurnberg/21103/50-21103unknown2007-03-021-12/+12
|\ \ \ | |/ / | | / | |/ |/|
| * Bug #21103: DATE column not compared as DATEunknown2007-03-021-12/+12
* | Automerge fix: "Out of range value" error message adjusted to 5.1. unknown2006-10-031-24/+24
* | After merge fixunknown2006-10-031-48/+48
|\ \ | |/
| * Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2unknown2006-09-291-48/+48
| |\
| | * Bug#6147: Traditional: Assigning a string to a numeric column has unexpected ...unknown2006-07-201-48/+48
| * | Merge xiphis.org:/home/antony/work2/mysql-5.0-enginesunknown2006-08-141-2/+2
| |\ \
| | * | BUG#14770 - LOAD DATA INFILE doesn't respect default values forunknown2006-08-021-2/+2
| | |/
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-09-251-272/+272
|\ \ \
| * | | Fixed result file. Blob width 8192 changed to 16777216.unknown2006-09-221-272/+272
* | | | Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysqlunknown2006-07-301-4/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fixed bug #19714.unknown2006-07-131-4/+4
| |/
* | Merge mysql.com:/data0/mysqldev/my/tmp_mergeunknown2006-05-171-4/+4
|\ \ | |/
| * Bug#17048 CREATE TABLE ... SELECT truncate valuesunknown2006-05-131-4/+4
* | Bug#10460 SHOW CREATE TABLE uses inconsistent upper/lower caseunknown2006-02-221-38/+38
* | WL#1563 - Modify MySQL to support fast CREATE/DROP INDEXunknown2006-01-231-4/+4
* | Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integrationunknown2005-12-201-0/+4
|\ \ | |/
| * WL#2930 Adding view and cursor 'protocols' to mysqltestunknown2005-10-311-0/+4
View Lorry Controller Status