summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from next-mr.unknown2010-01-121-8/+7
|\
| * fixed "engine not found" error in open_binary_frmSergei Golubchik2009-12-231-2/+2
| * WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-6/+5
* | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-7/+37
|\ \ | |/ |/|
| * merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-7/+19
| |\
| | * merge mysql-5.1-rep+2 --> mysql-5.1-rep+3Alfranio Correia2009-12-141-0/+18
| | |\
| | * \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-113/+13
| | |\ \
| | * \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-10/+10
| | |\ \ \
| | * \ \ \ Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-3/+76
| | |\ \ \ \
| | * \ \ \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-6/+18
| | |\ \ \ \ \
| | | * | | | | post-push fixes for BUG#39934Sven Sandberg2009-08-191-2/+2
| | | * | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-7/+10
| | | * | | | | Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-3/+12
| | | |\ \ \ \ \
| | | | * | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-3/+12
| * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-100/+197
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | WL#5142 FLUSH LOGS should take optional arguments for which log(s) to flushunknown2009-12-031-0/+18
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-191-72/+125
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-72/+125
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-72/+127
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ AutomergeAlexey Kopytov2009-12-131-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Bug #42849: innodb crash with varying time_zone on partitioned Alexey Kopytov2009-12-131-1/+1
| | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | * | | | | | | | merge of bug #49250 to 5.1-bugteamGeorgi Kodinov2009-12-111-72/+125
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | | * | | | | | | Bug #49250 : spatial btree index corruption and crashGeorgi Kodinov2009-12-101-41/+65
* | | | | | | | | | | Backport of fix for bug#35020Martin Hansson2009-12-171-34/+84
|/ / / / / / / / / /
* | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-100/+197
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-305/+696
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Automerge.Davi Arnaut2009-11-251-12/+33
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ mergeKristofer Pettersson2009-11-201-12/+25
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-12/+25
| | * | | | | | | | | | BUG#47995: Mark system functions as unsafeSven Sandberg2009-11-181-0/+8
| * | | | | | | | | | | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crashDavi Arnaut2009-11-121-88/+164
| |/ / / / / / / / / /
* | | | | | | | | | | Fix merge mistake.Alexander Nozdrin2009-12-021-2/+2
* | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-108/+6
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Manual resolving for the following filesAndrei Elkin2009-12-011-107/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-3/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-110/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-110/+11
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-10/+10
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | mergeMattias Jonsson2009-11-241-17/+19
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-17/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-17/+19
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Backport of Bug#27249 to mysql-next-mrDavi Arnaut2009-11-101-7/+9
| | | * | | | | | | | | Backport of Bug#27525 to mysql-next-mrDavi Arnaut2009-11-101-10/+10
* | | | | | | | | | | | merge of bug#35765 into mysql-next-mr-bugfixingMattias Jonsson2009-11-241-1/+2
|/ / / / / / / / / / /
* | | | | | | | | | | merge of Bug#33204 (backport)Martin Hansson2009-11-201-190/+239
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-190/+239
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-2/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | mergeGeorgi Kodinov2009-10-301-2/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Bug #48293: crash with procedure analyse, view with > 10 columns,Georgi Kodinov2009-10-301-2/+1
| | | | * | | | | | | | Bug#34895 'show procedure status' or 'show function status' +Kristofer Pettersson2009-09-301-4/+0