summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_5merge.result
Commit message (Expand)AuthorAgeFilesLines
* MDEV-6980 OUT parameters in PREPARESergei Golubchik2014-12-041-80/+2
* MDEV-5317 out parameters in PREPARE "SELECT ... INTO"Sergei Golubchik2014-10-101-2/+80
* MDEV-6287 Bad warning level when inserting a DATETIME value into a TIME columnAlexander Barkov2014-06-021-8/+8
* Merge from 5.3.Alexander Barkov2013-09-131-12/+12
|\
| * MDEV-4724 Some temporal functions do not preserve microsecondsAlexander Barkov2013-09-121-12/+12
| * MDEV-4651 Crash in my_decimal2decimal in a ORDER BY queryAlexander Barkov2013-06-171-4/+4
* | merge with mysql-5.5.21Sergei Golubchik2012-03-091-4/+4
|\ \
| * \ mergeGeorgi Kodinov2010-09-301-272/+272
| |\ \
* | | | after merge changes:Sergei Golubchik2011-12-121-24/+24
* | | | merge with 5.3Sergei Golubchik2011-10-191-86/+750
|\ \ \ \ | | |_|/ | |/| |
| * | | Removed settings of 'derived_merge' to 'on' in ps tests.Igor Babaev2011-07-221-6/+0
| * | | Made the optimizer switches 'derived_merge' and 'derived_with_keys'Igor Babaev2011-07-211-0/+6
| * | | merge with 5.1-microSergei Golubchik2011-06-071-42/+42
| |\ \ \
| | * | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-14/+14
| * | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-48/+712
| |\ \ \ \ | | |/ / /
| | * | | unix_timestamp() and from_unixtime() supports microseconds.Sergei Golubchik2011-05-221-8/+8
| | * | | lp:731229 Different results depending on table access method with TIME column...Sergei Golubchik2011-03-081-0/+16
| | * | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-40/+688
| | | |/ | | |/|
| * | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-272/+272
| |\ \ \ | | |/ /
* | | | merge.Sergei Golubchik2010-11-251-4/+4
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ \
| * \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-2/+2
| |\ \ \ \
| * \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-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
* | | | | | | | | | mysql-5.1 -> mysql-5.5 mergeSergei Golubchik2010-11-051-272/+272
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Bug #53296: LONG BLOB value types are not recognizedGeorgi Kodinov2010-08-161-272/+272
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | WL#2649 Number-to-string conversionsAlexander Barkov2010-02-111-72/+72
* | | | | | | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-221-74/+74
* | | | | | | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-301-42/+42
|/ / / / / / /
* | | | | | | Bug #39265: fix for the bug 33699 should be revertedGleb Shchepa2009-02-051-4/+6
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
* | | | | | | Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULLunknown2008-01-111-6/+4
| |_|/ / / / |/| | | | |
* | | | | | 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
| |/ /
View Lorry Controller Status