summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-31245-3095/+13022
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-24168-30872/+32693
|\
| * Manual merge.Alexey Kopytov2010-03-194-55/+339
| |\
| | * Bug #8433: Overflow must be an error Alexey Kopytov2010-03-184-55/+339
| * | BUG#51426: overflow for auto_increment column causes slave to stopLuis Soares2010-03-173-1/+3
| * | mergeMattias Jonsson2010-03-161-2/+2
| |\ \
| | * | Bug#51347: assertion with show create table + partition by columnsMattias Jonsson2010-03-041-2/+2
| * | | A post-review fix for type-aware metadata locks.Konstantin Osipov2010-03-1614-389/+221
| |\ \ \
| | * | | A review comment for the fix for Bug#46672.Konstantin Osipov2010-03-1312-351/+199
| * | | | MergeMagnus Blåudd2010-03-151-1/+1
| |\ \ \ \
| | * \ \ \ Merge in fix for bug#42589Magnus Blåudd2010-03-151-1/+1
| | |\ \ \ \
| | | * | | | Bug#42589 mysql_fix_privilege_tables.sh to be deprecatedMagnus Blåudd2009-10-071-1/+1
| * | | | | | Bug #51160 Deadlock around SET GLOBAL EVENT_SCHEDULER = ON|OFFJon Olav Hauglid2010-03-153-25/+34
| |/ / / / /
| * | | | | BUG#51716 post push fix.Luis Soares2010-03-121-1/+14
| | |/ / / | |/| | |
| * | | | A fix for Bug#49972 "Crash in prepared statements": Konstantin Osipov2010-03-111-2/+1
| * | | | Automerge: mysql-next-mr-bugfixing bug branch --> mysql-next-mr-bugfixing lat...Luis Soares2010-03-112-11/+10
| |\ \ \ \
| | * | | | Fix for BUG#51716 and BUG#51787.Luis Soares2010-03-102-11/+10
| * | | | | Automatic merge.Davi Arnaut2010-03-101-59/+46
| |\ \ \ \ \
| | * | | | | Bug#33669: Transactional temporary tables do not work under --read-onlyDavi Arnaut2010-03-101-59/+46
| * | | | | | Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-03-106-49/+118
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#50888 valgrind warnings in Field_timestamp::val_strTor Didriksen2010-03-091-5/+6
| | |/ / / /
| | * | | | Bug#51295 Build warnings in mdl.ccMarc Alff2010-03-072-42/+95
| | * | | | Fix for BUG#51215 "log-error partially works with version 5.5": WL 4738 (reen...Guilhem Bichot2010-03-053-2/+17
| * | | | | A fix and a test case for Bug#51710 FLUSH TABLES <view> WITH READKonstantin Osipov2010-03-101-0/+23
| |/ / / /
| * | | | Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-03-0450-677/+1370
| |\ \ \ \
| | * | | | A follow-up on WL#5154 and WL#5182: remove forgotten options.Alexander Nozdrin2010-03-038-86/+32
| | * | | | mergeVladislav Vaintroub2010-03-031-1/+1
| | |\ \ \ \
| | | * | | | Fix for debug print of null stringMattias Jonsson2010-03-031-1/+1
| | | | |/ / | | | |/| |
| | * | | | mergeVladislav Vaintroub2010-03-031-2/+6
| | |\ \ \ \
| | | * | | | Bug #51488 :missing features and change behavior in cmake runs compared toVladislav Vaintroub2010-03-031-2/+6
| | * | | | | Fix a problem reported by Alik:Vladislav Vaintroub2010-03-031-4/+4
| | | |/ / / | | |/| | |
| | * | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-0244-584/+1327
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | manual merge fix of bug#42438 in mysql-next-mr-mergeMattias Jonsson2010-03-022-3/+6
| | | * | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-0122-316/+808
| | | |\ \ \
| | | | * \ \ Mergine from mysql-next-meAlexander Barkov2010-02-2796-7273/+11992
| | | | |\ \ \
| | | | | * \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-2516-211/+139
| | | | | |\ \ \
| | | | | * \ \ \ Merging WL#1213 into mysql-next-mr-bar2Alexander Barkov2010-02-245-19/+69
| | | | | |\ \ \ \
| | | | | | * | | | Backporting WL#1213Alexander Barkov2010-02-245-19/+69
| | | | * | | | | | WL#2649 Number-to-string conversionsAlexander Barkov2010-02-1120-299/+744
| | | * | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-03-014-22/+45
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-252-2/+11
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | * | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-2427-244/+470
| | | |\ \ \ \ \ \ \ \
| * | | | | | | | | | | Bug #51376 Assert `! is_set()' failed in Jon Olav Hauglid2010-03-031-7/+9
| |/ / / / / / / / / /
| * | | | | | | | | | Merged recent changes from mysql-next-mr-bugfixingDmitry Lenev2010-03-011-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | BUG#50296Andrei Elkin2010-03-011-1/+1
| * | | | | | | | | | | Merged recent changes from mysql-next-mr-bugfixingDmitry Lenev2010-03-011-3/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | WL#5252: Deprecate --optimizer_search_depth=63Roy Lyseng2010-03-011-3/+16
| * | | | | | | | | | | Merge recent changes from mysql-next-mr-bugfixingDmitry Lenev2010-03-013-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Bug#50296 Slave reconnects earlier than the prescribed slave_net_timeout valueMarc Alff2010-03-011-1/+1
| | * | | | | | | | | | merging to 6.0-codebase-bugfixing from a local branchAndrei Elkin2010-02-283-3/+5
| | |\ \ \ \ \ \ \ \ \ \