summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2009-11-201-2/+12
|\
| * Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-2/+12
| |\
| | * Backport of Bug#15192 to mysql-next-mrDavi Arnaut2009-11-101-1/+5
| | * Backport of Bug#41860 to mysql-next-mrDavi Arnaut2009-11-101-2/+5
| | * Backport of Bug#10374 to mysql-next-mrDavi Arnaut2009-11-101-1/+4
* | | automergeVladislav Vaintroub2009-11-131-2/+11
|\ \ \ | |/ /
| * | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-3/+19
| |\ \
| * \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+6
| |\ \ \
| | * \ \ Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+6
| | |\ \ \
| | | * \ \ manual merge of 28141Tatiana A. Nurnberg2009-10-201-0/+6
| | | |\ \ \
| | | | * | | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd...Tatiana A. Nurnberg2009-10-191-0/+6
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-2/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | |
| | * | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-2/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-2/+5
* | | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-091-2/+2
| |_|_|_|/ |/| | | |
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-57/+51
|\ \ \ \ \ | |/ / / /
| * | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-21/+7
| |\ \ \ \
| * \ \ \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-3/+39
| |\ \ \ \ \
| * | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-48/+4
| * | | | | | Fix a windows build failure (next-mr-runtime).Konstantin Osipov2009-10-161-21/+21
| * | | | | | Backport of:Konstantin Osipov2009-10-141-3/+3
| * | | | | | Introduce thd->query_cache_tls (threadKonstantin Osipov2009-10-131-0/+24
| * | | | | | This patch is prerequisite for the 2nd milestone of WL#148 "Foreign keys"Dmitry Lenev2009-10-091-5/+19
| * | | | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-1/+1
* | | | | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-021-3/+19
| |_|/ / / / |/| | | | |
* | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-21/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Manual merge semi-sync to 5.1-rep+2He Zhenxing2009-10-031-18/+3
| |\ \ \ \ \
| | * | | | | Backporting WL#4398 WL#1720He Zhenxing2009-09-261-18/+3
| * | | | | | WL#4828 and BUG#45747Alfranio Correia2009-09-291-3/+0
| * | | | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+4
| |/ / / / /
* | | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-1/+6
|\ \ \ \ \ \
| * | | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-0/+2
| * | | | | | WL#1397 convert XML -> SQLAlexander Barkov2009-10-121-1/+4
| | |/ / / / | |/| | | |
* | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-1/+26
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-191-1/+26
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Bug#47280 - strange results from count(*) with order by multiple Jorgen Loland2009-10-141-1/+26
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-1/+7
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-1/+7
| |\ \ \ \ | | |/ / /
| | * | | auto-mergeIngo Struewing2009-10-011-0/+5
| | |\ \ \
| | | * | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+5
| | * | | | Bug#46958: Assertion in Diagnostics_area::set_ok_status, Martin Hansson2009-09-281-1/+2
| | |/ / /
* | | | | Ported WL#3220 to mysql-next-mr.Georgi Kodinov2009-09-281-0/+1
* | | | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-171-1/+28
|\ \ \ \ \ | |/ / / /
| * | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-161-0/+25
| |\ \ \ \ | | |/ / /
| | * | | Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent tableSergey Glukhov2009-09-101-0/+25
| | |/ /
* | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-171/+180
|/ / /
* | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-21/+36
|\ \ \ | |/ /
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-1/+1
| |\ \
| * | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+1
| * | | Merge from 5.0Gleb Shchepa2009-07-241-21/+31
| |\ \ \ | | | |/ | | |/|