summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
Commit message (Expand)AuthorAgeFilesLines
* Backport of revno: 2617.69.40Jon Olav Hauglid2009-12-091-2/+2
* Backport of:Konstantin Osipov2009-12-081-8/+2
* Backport of:Konstantin Osipov2009-12-041-8/+8
* Backport of:Konstantin Osipov2009-12-041-7/+8
* Merge next-mr -> next-4284Konstantin Osipov2009-12-031-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
* | | | Backport of:Konstantin Osipov2009-12-021-4/+5
* | | | Backport of:Konstantin Osipov2009-12-011-3/+3
* | | | Backport of:Konstantin Osipov2009-12-011-3/+3
* | | | Backport of:Konstantin Osipov2009-12-011-6/+7
* | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-1/+6
|/ / /
* | | Backport of:Konstantin Osipov2009-11-241-4/+4
* | | 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
|\ \ | |/
| * Bug#44521 Executing a stored procedure as a prepared statement can sometimes ...Kristofer Pettersson2009-07-291-2/+2
| * Merge from 5.0Gleb Shchepa2009-07-241-4/+2
| |\
| | * Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-4/+2
| | * Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-2/+31
| | |\
| | | * Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-5/+5
| | | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-8/+13
| | | |\
| | | * \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-3/+10
| | | |\ \
| | | * \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-0/+4
| | | |\ \ \
| | | * \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-1/+7
| | | |\ \ \ \