summaryrefslogtreecommitdiff
path: root/sql/sql_view.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-78/+111
|\
| * Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-021-8/+5
| |\
| | * Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-8/+5
| | |\
| * | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-241-1/+1
| |/ /
| * | Fix for bug #50913 "Deadlock between open_and_lock_tables_derivedDmitry Lenev2010-02-081-0/+4
| * | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-3/+3
| |\ \
| | * \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-211-3/+3
| | |\ \
| | | * \ merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-11/+18
| | | |\ \
| | | * \ \ Manual merge from next-mr.unknown2010-01-121-9/+0
| | | |\ \ \
| | | * \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-3/+3
| | | |\ \ \ \
| | | | * \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-1/+1
| | | | |\ \ \ \
| | | | * | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-1/+1
| | | | * | | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-2/+2
| | | | |\ \ \ \ \
| | | | | * | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-2/+2
| * | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-3/+5
| * | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-7/+10
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | backported:Sergey Glukhov2010-01-151-7/+10
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-9/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-11/+18
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-9/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-9/+0
| | |/ / / / /
| * | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-5/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-1/+1
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-5/+5
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge cleanupMarc Alff2009-12-111-1/+1
| | * | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-4/+7
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-4/+4
| * | | | | | | | Implement new type-of-operation-aware metadata locks.Dmitry Lenev2010-02-011-2/+2
| * | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-1/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Bug #49130 Running mtr tests with valgrind and debug produces lots of warningsTor Didriksen2009-12-021-1/+2
| | * | | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-4/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-3/+5
| * | | | | | | | Backport of revno: 3673Jon Olav Hauglid2009-12-101-0/+14
| * | | | | | | | Backport of revno: 2617.68.43Jon Olav Hauglid2009-12-101-0/+1
| * | | | | | | | Backport of revno: 2617.71.1Jon Olav Hauglid2009-12-101-1/+1
| * | | | | | | | Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,Konstantin Osipov2009-12-051-1/+2
| * | | | | | | | Backport of:Konstantin Osipov2009-12-011-2/+2
| * | | | | | | | Backport of:Konstantin Osipov2009-12-011-3/+0
| * | | | | | | | Backport of:Konstantin Osipov2009-12-011-1/+1
| * | | | | | | | Backport of:Konstantin Osipov2009-11-301-2/+0
| * | | | | | | | Backport of:Konstantin Osipov2009-11-301-1/+1
| * | | | | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-38/+54
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Backport of:Konstantin Osipov2009-11-241-4/+4
| |/ / / / / /
* | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-0/+32
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Bug#40277: SHOW CREATE VIEW returns invalid SQLDavi Arnaut2010-03-091-0/+32
* | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-221-8/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug#50624: crash in check_table_access during call procedureDavi Arnaut2010-02-131-8/+5
* | | | | | | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-3/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Backport Bug#37148 to 5.1He Zhenxing2010-01-241-3/+5