summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-8/+8
|\
| * Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-171-1/+4
| |\
| * \ Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-35/+1
| |\ \
| * | | WL#2360 Performance schemaMarc Alff2009-12-091-8/+8
* | | | Auto-merge from mysql-next-mr-summit0.3.Alexander Nozdrin2009-12-161-1/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | MergeMikael Ronstrom2009-12-141-36/+7
| |\ \ \ | | | |/ | | |/|
| * | | Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-11/+1
| |\ \ \
| * | | | WL#5138, Fixed according to code review comments from DaviMikael Ronstrom2009-11-241-1/+4
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-0/+2
| |\ \ \ \
| | * \ \ \ Auto-merged.Evgeny Potemkin2009-12-021-0/+2
| | |\ \ \ \
| | | * | | | Bug#48508: Crash on prepared statement re-execution.Evgeny Potemkin2009-12-011-0/+2
* | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-101-0/+6
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | WL#2360 Performance schemaMarc Alff2009-12-041-0/+6
* | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-031-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-1/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-11/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Backport of:Konstantin Osipov2009-11-231-10/+0
| * | | | | Backport of:Konstantin Osipov2009-11-201-1/+1
| | |_|_|/ | |/| | |
* | | | | Auto mergeHe Zhenxing2009-11-211-36/+12
|\ \ \ \ \
| * \ \ \ \ Merge with next-mrKonstantin Osipov2009-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
| * | | | | merge of Bug#33204 (backport)Martin Hansson2009-11-201-62/+81
| |\ \ \ \ \ | | |/ / / /
| * | | | | Backport of Bug#33204 from mysql-pe toMartin Hansson2009-11-101-34/+0
* | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-1/+1
| |/ / / / |/| | | |
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-3/+19
|\ \ \ \ \
| * \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-57/+51
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-021-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
* | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-21/+7
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
| | |/ / / /
* | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-3/+39
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |