summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-031-1/+1
|\
| * Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-031-1/+1
| |\
| | * Fix for valgrind warning: check whether pointer was initialized.Davi Arnaut2010-02-021-1/+1
| | * Applying InnoDB snapshot, fixes BUG#46193.Sergey Vojtovich2010-01-222-103/+131
| | * Applying InnoDB snapshot Sergey Vojtovich2010-01-222-5/+5
| | * Applying InnoDB snapshot, fixes BUG#49238.Sergey Vojtovich2010-01-221-9/+23
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-246-19/+19
| |\ \ | | |/
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-286-19/+19
|\ \ \ | | |/ | |/|
| * | Apply patch on behalf of Magnus:Davi Arnaut2010-01-201-1/+1
| * | Apply patch on behalf of the NDB team:Davi Arnaut2010-01-205-18/+18
| * | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-241-1/+0
| * | Applying InnoDB snapshot 5.1-ss6344, Fixes BUG#47814Satya B2009-12-237-60/+193
| * | Applying InnoDB snapshot 5.1-ss6344, part 2. Fixes BUG#41609 but doesSatya B2009-12-214-21/+31
* | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-1464-0/+16877
|\ \ \
| * | | WL#2360 Performance schemaMarc Alff2010-01-1164-0/+16877
* | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-2/+2
|\ \ \ \ | |/ / /
| * | | WL#2360 Performance schemaMarc Alff2010-01-061-2/+2
* | | | Manual merge from next-mr.2010-01-128-40/+101
|\ \ \ \ | |/ / /
| * | | mergedSergei Golubchik2009-12-246-21/+28
| |\ \ \
| | * \ \ Manual merge from mysql-trunk.Alexander Nozdrin2009-12-241-1/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Postfix for Bug#37408 (fix for Bug#49898).Alexander Nozdrin2009-12-241-1/+0
| | | * | Backporting fix for Bug#49834 from mysql-next-mr-bugfixingAlexander Nozdrin2009-12-231-1/+6
| | | * | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-227-46/+46
| | | |\ \
| | | | * \ Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-197-39/+46
| | | | |\ \
| * | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-228-39/+101
* | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-073-7/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-174-23/+36
| |\ \ \ \ \ \
| | * \ \ \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-3028-347/+374
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-10111-2534/+2585
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-0/+8
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-304-34/+35
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-4/+3
| | | * | | | | | | | | Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-143-20/+26
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-143-20/+26
| * | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-1779-502/+1654
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-234-19/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-228-49/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Automerge the changes of version 5.5.0-m2.Joerg Bruehe2009-12-164-19/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Automerge the build fixes of 5.5.0-m2 back into the tree.Joerg Bruehe2009-12-164-19/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Type change: "fk->name" is no "const char *" any more, rather a "LEX_STRING".MySQL Build Team2009-11-171-5/+5
| | | * | | | | | | | | | | | The "hash_*" functions have got a prefix "my_" in 2008.MySQL Build Team2009-11-172-12/+12
| | | * | | | | | | | | | | | Add missing cleanup, needed for "make distcheck" to succeed.MySQL Build Team2009-11-131-1/+1
| | | * | | | | | | | | | | | Solve a "make" rule issue in the context of dtarce and shared objects:MySQL Build Team2009-11-131-1/+4
* | | | | | | | | | | | | | | Bug#49834 - fixed a bug introduced by mismerge.Vladislav Vaintroub2009-12-221-1/+6
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fix inconsistently defined THR_LOCK_myisam_mmapVladislav Vaintroub2009-12-202-9/+9
* | | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-198-42/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-1666-346/+1338
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-1119-23/+183
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-1/+1
View Lorry Controller Status