summaryrefslogtreecommitdiff
path: root/mysql-test/r/sp.result
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-191-7/+6
|\
| * Fix LP bug lp:802979unknown2011-07-041-3/+3
| * Buildbot fixes:Sergey Petrunya2011-06-031-1/+0
| * Buildbot fixes: let mysql-test/t/sp.test set @@query_cache_size only if the s...Sergey Petrunya2011-06-031-2/+2
| * Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+1
| |\
| | * wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-1/+1
* | | 5.5-mergeSergei Golubchik2011-07-021-0/+48
|\ \ \
| * \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-171-0/+30
| |\ \ \
| | * | | Patch for Bug#11765684 (58674: SP-cache does not detect changes inAlexander Nozdrin2011-03-101-0/+30
| * | | | BUG#11766234: ASSERT (TABLE_REF->TABLE || TABLE_REF->VIEW) Jorgen Loland2011-03-141-0/+18
| |/ / /
* | | | lots of post-merge changesSergei Golubchik2011-04-251-3/+3
* | | | merge.Sergei Golubchik2010-11-251-6/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-4/+3
| |\ \
| | * \ merge 5.1->5.2Sergei Golubchik2010-06-011-2/+2
| | |\ \ | | | |/
| | | * Bug#47974 'TYPE=storage_engine' is deprecated and will be Magne Mahre2010-02-091-2/+2
| | * | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-2/+1
| | |/
| * | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-0/+90
| |\ \ | | |/
| * | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-5/+5
* | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-07-301-9/+167
* | | Patch for Bug#21818 (Return value of ROW_COUNT() is incorrectAlexander Nozdrin2010-05-141-2/+2
* | | A fix for Bug#11918 "SP does not accept variables in LIMIT clause"Konstantin Osipov2010-04-141-0/+103
* | | Manual merge.Alexey Kopytov2010-03-191-23/+9
|\ \ \
| * | | Bug #8433: Overflow must be an error Alexey Kopytov2010-03-181-23/+9
* | | | Bug#31767 DROP FUNCTION name resolutionMarc Alff2010-02-231-2/+2
|/ / /
* | | Patch for WL#3736: Extended Table, Column and Index Comments.Alexander Nozdrin2010-02-201-2/+2
* | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-0/+16
|\ \ \
| * \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-221-8/+8
| |\ \ \
| * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-0/+16
| |\ \ \ \
| | * \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-251-0/+16
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug#47649 crash during CALL procedureSergey Glukhov2009-12-231-0/+16
* | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-8/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | backported:Sergey Glukhov2010-01-151-8/+8
| |/ / / /
* | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-6/+3
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge of WL#4738 from mysql-next-mr: Alexey Kopytov2009-12-281-6/+3
| |\ \ \ \
| | * | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-6/+3
* | | | | | Merge next-mr -> next-4284. Konstantin Osipov2010-02-021-10/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-221-10/+10
| |/ / / /
* | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-0/+58
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-0/+58
| |\ \ \ \ | | |/ / /
| | * | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-57/+33
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crashDavi Arnaut2009-11-121-0/+58
* | | | | Backport of revno: 3673Jon Olav Hauglid2009-12-101-0/+59
* | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-031-9/+0
|\ \ \ \ \ | |/ / / /
| * | | | Manual resolving for the following filesAndrei Elkin2009-12-011-9/+0
| |\ \ \ \
| | * \ \ \ manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-9/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-9/+0
| | | | |/ | | | |/|
* | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-4/+2
|/ / / /
* | | | Enable test cases for Bug#6063 and Bug#7088.Magne Mahre2009-11-201-0/+34
* | | | Backport of Bug#36649 to mysql-next-mrDavi Arnaut2009-11-101-0/+95
| |_|/ |/| |
* | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-7/+0
|\ \ \