summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-01-181-43/+123
|\
| * merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-12/+6
| |\
| * \ Manual merge from next-mr.unknown2010-01-121-48/+23
| |\ \
| * \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-43/+127
| |\ \ \
| | * \ \ merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-44/+122
| | |\ \ \
| | | * \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-2/+11
| | | |\ \ \
| | | * \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-2/+58
| | | |\ \ \ \
| | | * | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-6/+29
| | | * | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-21/+7
| | | |\ \ \ \ \
| | | * | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-10-141-26/+5
| | | * | | | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-38/+114
| | | |\ \ \ \ \ \
| | | | * | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-22/+72
| | | | * | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-33/+59
| | * | | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-151-0/+6
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-0/+6
| | * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-2/+11
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-2/+58
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | mergeVladislav Vaintroub2010-01-111-12/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-12/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | mergeVladislav Vaintroub2009-12-251-41/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-41/+20
| |/ / / / / /
* | | | | | | mergeVladislav Vaintroub2009-12-191-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-8/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Auto-merge from mysql-next-mr-summit0.3.Alexander Nozdrin2009-12-161-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
* | | | | | | | | | | mergeVladislav Vaintroub2009-12-191-9/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-171-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
| * | | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-35/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-8/+8
* | | | | | | | | | | | mergeVladislav Vaintroub2009-12-111-35/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-101-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-031-1/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-11/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Auto mergeHe Zhenxing2009-11-211-36/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-2/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | 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
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | mergeVladislav Vaintroub2009-12-101-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-041-0/+6
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | mergeVladislav Vaintroub2009-12-041-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-1/+0
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | mergeVladislav Vaintroub2009-11-251-11/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Backport of:Konstantin Osipov2009-11-231-10/+0