summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-071-0/+1
* WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+12
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-4/+6
|\
| * Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-221-4/+6
| |\
| | * Bug#48449: hang on show create view after upgrading when view contains functi...Davi Arnaut2010-02-101-5/+2
| | * Bug#49534: multitable IGNORE update with sql_safe_updatesMartin Hansson2010-02-101-1/+3
* | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-3/+3
|\ \ \
| * \ \ Merging with mysql-next-mr-bugfixing.Mats Kindahl2010-01-251-0/+5
| |\ \ \
| * | | | Patch to eliminate warnings in mysql-next-mr-bugteam.Mats Kindahl2010-01-251-3/+3
* | | | | Fix for bug #50908 "Assertion `handler_tables_hash.records == 0' Dmitry Lenev2010-02-121-0/+16
* | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-0/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-191-0/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-191-0/+5
| | |\ \ \
| | | * | | Backport from 6.0-codebase.Sergey Vojtovich2009-12-151-0/+5
* | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-76/+526
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-48/+76
| |\ \ \ \ \ | | |/ / / /
| * | | | | Manual merge from next-mr.unknown2010-01-121-39/+30
| |\ \ \ \ \
| * \ \ \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-75/+524
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-75/+524
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-15/+54
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-0/+40
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-16/+104
| | | * | | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-3/+36
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-10-141-60/+32
| | | * | | | | | | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-62/+451
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | post-push fixes for BUG#39934Sven Sandberg2009-08-191-14/+15
| | | | * | | | | | | | | Post-push fixes for BUG#39934Sven Sandberg2009-07-221-3/+16
| | | | * | | | | | | | | Post-push fix for BUG#39934Sven Sandberg2009-07-221-0/+292
| | | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-29/+94
| | | | * | | | | | | | | Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-52/+70
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-51/+70
| | * | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-13/+52
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-0/+40
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-48/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-48/+76
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-33/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-35/+25
| |/ / / / / / / / / /
* | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-9/+34
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-171-0/+20
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge to latest mysql-next-mrMikael Ronstrom2009-12-161-0/+5
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ MergeMikael Ronstrom2009-12-141-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-5/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | WL#5138, Fixed according to code review comments from DaviMikael Ronstrom2009-11-241-0/+20
| * | | | | | | | | | | | | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-161-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | * | | | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-247/+313
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | / / / / | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Bug #38883 (reopened): thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-011-0/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-9/+9
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
View Lorry Controller Status