summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-2/+9
|\
| * Fixed a build failure in mysql-trunk-merge caused by a badAlexey Kopytov2009-12-281-3/+3
| * Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-251-2/+9
| |\
| | * Bug#47649 crash during CALL procedureSergey Glukhov2009-12-231-2/+9
* | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-141-3/+3
|\ \ \
| * | | WL#2360 Performance schemaMarc Alff2010-01-111-3/+3
* | | | Manual merge from next-mr.2010-01-121-10/+11
|\ \ \ \ | |/ / /
| * | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-10/+10
* | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-10/+7
|\ \ \ \ | |/ / / |/| | |
| * | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-10/+7
| |\ \ \
| | * \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-21/+22
| | |\ \ \
| | * | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-1/+1
| | * | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-0/+1
| | |\ \ \ \
| | * \ \ \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-9/+6
| | |\ \ \ \ \
| | | * | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-8/+5
| | | * | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-1/+1
| * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-6/+18
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge to latest mysql-next-mrMikael Ronstrom2009-12-161-6/+18
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-6/+18
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-33/+65
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-6/+18
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | mergeKristofer Pettersson2009-11-201-6/+18
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-6/+18
* | | | | | | | | | MergeMikael Ronstrom2009-12-141-4/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-3/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Manual resolving for the following filesAndrei Elkin2009-12-011-3/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-18/+22
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-3/+0
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| * | | | | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-4/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Auto mergeHe Zhenxing2009-11-211-5/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-4/+0
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioningMattias Jonsson2009-11-201-1/+1
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Backport of:Konstantin Osipov2009-11-241-4/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | WL#5138, Fixed according to code review comments from DaviMikael Ronstrom2009-11-241-2/+2
* | | | | | | | | WL#5138, fixed review commentsMikael Ronstrom2009-11-231-2/+0
* | | | | | | | | WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-201-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-121-2/+2
* | | | | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-4/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Backport of Bug#15192 to mysql-next-mrDavi Arnaut2009-11-101-3/+0
| * | | | | | | | Backport of Bug#36649 to mysql-next-mrDavi Arnaut2009-11-101-1/+0
* | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'.Alexander Nozdrin2009-11-051-1/+1
* | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-14/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-14/+17
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Bug #47412: Valgrind warnings / user can read uninitalized memory using Georgi Kodinov2009-10-261-14/+17
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-4/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-4/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | |
| | * | | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-4/+5
| | | |/ / | | |/| |
View Lorry Controller Status