summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-2/+11
|\
| * merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-2/+11
| |\
| | * 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
| | * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-2/+5
* | | | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-2/+58
|\ \ \ \ | |/ / /
| * | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-2/+58
| |\ \ \ | | |/ /
| | * | Bug#47280 - strange results from count(*) with order by multiple Jorgen Loland2009-10-141-1/+26
| | * | 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
| | |/ /
| | * | Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent tableSergey Glukhov2009-09-101-0/+25
* | | | 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
|\ \ \ \ | |/ / /
| * | | 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
| |/ /
* | | 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
* | | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-1/+1
|\ \ \
| * \ \ Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-3/+40
| |\ \ \ | | |/ /
| * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-1/+1
* | | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+1
* | | | Merge from 5.0Gleb Shchepa2009-07-241-21/+31
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-21/+31
| * | | Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-1/+1
| * | | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-0/+11
| |\ \ \
| * \ \ \ Merge from Tim's 5.0.76-release tree to make 5.0.77 .Chad MILLER2009-01-211-0/+7
| |\ \ \ \
| * \ \ \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-11/+19
| |\ \ \ \ \
| * \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-6/+38
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-0/+8
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-0/+8
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-0/+8
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-0/+8
| | | | |\ \ \ \ \ \ \ \
* | | | | | | | | | | | | Add a comment for thd->proc_info.Konstantin Osipov2009-07-221-0/+4
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Fix for a valgrind warning due to use of a uninitializedDavi Arnaut2009-06-081-1/+2
* | | | | | | | | | | | Bug#44672: Assertion failed: thd->transaction.xid_state.xid.is_null()Davi Arnaut2009-06-051-0/+8
* | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contortedHe Zhenxing2009-05-301-1/+1
* | | | | | | | | | | | Bug#44658 Create procedure makes server crash when user does not have ALL pri...Kristofer Pettersson2009-05-291-1/+29
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Manual merge.Ramil Kalimullin2009-03-251-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Auto-mergeRamil Kalimullin2009-03-251-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix for bug#35383: binlog playback and replication breaksRamil Kalimullin2009-03-251-0/+3
* | | | | | | | | | | | Bug#43748: crash when non-super user tries to kill the replication threadsTatiana A. Nurnberg2009-03-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Bug#43748: crash when non-super user tries to kill the replication threadsTatiana A. Nurnberg2009-03-251-0/+1
| |/ / / / / / / / / /
| * | | | | | | | | | BUG#37051 Replication rules not evaluated correctlyHe Zhenxing2009-03-051-0/+7
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | MergeSergey Petrunia2009-03-191-1/+1
|\ \ \ \ \ \ \ \ \ \