summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
Commit message (Expand)AuthorAgeFilesLines
* WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-10/+10
* 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
* | | | Backport a patch from 6.0:Alexander Nozdrin2009-11-021-1/+1
* | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-1/+0
|\ \ \ \
| * \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-0/+1
| |\ \ \ \
| * | | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to BetonySergey Glukhov2009-10-231-1/+0
* | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay logLuis Soares2009-09-291-0/+1
| | | |/ | | |/|
* | | | Merge with next-mr-runtime.Konstantin Osipov2009-10-221-2/+3
|\ \ \ \
| * \ \ \ AutomergeKristofer Pettersson2009-10-191-17/+22
| |\ \ \ \
| * | | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-191-2/+3
| | |/ / / | |/| | |
* | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-4/+15
| |/ / / |/| | |
* | | | Backport of:Konstantin Osipov2009-10-161-4/+8
* | | | Backport of:Konstantin Osipov2009-10-141-8/+9
* | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-5/+5
|/ / /
* | | WL#2110 (SIGNAL)Marc Alff2009-09-101-9/+24
| |/ |/|
* | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-6/+4
|\ \ | |/