summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Bug #48315 Metadata lock is not taken for merged views that useJon Olav Hauglid2010-02-181-3/+12
* Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-4/+1
|\
| * Manual merge from mysql-next-mr bug branch.Luis Soares2010-02-101-3/+0
| |\
| | * BUG#51021: current_stmt_binlog_row_based not removed in next-mrLuis Soares2010-02-101-3/+0
| * | Bug #50192 Strange effect in replication test, trigger, auto_increment Andrei Elkin2010-01-291-1/+1
| |/
* | Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-111-8/+35
* | Fix for bug #50913 "Deadlock between open_and_lock_tables_derivedDmitry Lenev2010-02-081-2/+2
* | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-170/+8
|\ \ | |/
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-211-170/+8
| |\
| | * merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-34/+34
| | |\
| | * \ Manual merge from next-mr.unknown2010-01-121-9/+9
| | |\ \
| | * \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-167/+8
| | |\ \ \
| | | * \ \ merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-167/+8
| | | |\ \ \
| | | | * \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-3/+3
| | | | |\ \ \
| | | | * \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-32/+25
| | | | |\ \ \ \
| | | | * | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-2/+2
| | | | * | | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-157/+6
| | | | |\ \ \ \ \
| | | | | * | | | | Post-push fix for BUG#39934Sven Sandberg2009-07-221-298/+0
| | | | | * | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-16/+43
| | | | | * | | | | Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-82/+202
| | | | | |\ \ \ \ \
| | | | | | * | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-82/+202
| | | * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-1/+6
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
* | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-5/+13
* | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-5/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | backported:Sergey Glukhov2010-01-151-5/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Bug #50786 Assertion `thd->mdl_context.trans_sentinel() == __null' Jon Olav Hauglid2010-02-031-4/+0
* | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-22/+40
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-35/+38
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-7/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-11/+11
| |/ / / / / / /
* | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-78/+78
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Auto-merge from mysql-next-mr-summit0.3.Alexander Nozdrin2009-12-161-2/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-1/+2
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-1/+2
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Auto-merged.Evgeny Potemkin2009-12-021-1/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Bug#48508: Crash on prepared statement re-execution.Evgeny Potemkin2009-12-011-1/+2
* | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-77/+76
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-171-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge to latest mysql-next-mrMikael Ronstrom2009-12-161-1/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | MergeMikael Ronstrom2009-12-141-17/+14
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge WL#5137 to mysql-next-mrMikael Ronstrom2009-11-271-2/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ WL#5137, Remove hash calculation from LOCK_open in open_tableMikael Ronstrom2009-11-201-2/+7
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Review comments for LOCK_open patchMikael Ronstrom2009-11-101-6/+6
| | | | * | | | | | | | | | | A minor change to MySQL's hash where calculation of hash can be done separate...Mikael Ronstrom2009-10-091-2/+7
| * | | | | | | | | | | | | | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-161-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | / / / / / / / / | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-76/+85
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | / / / / / / / | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | mergeKristofer Pettersson2009-11-201-1/+6
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-1/+6
| | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |