summaryrefslogtreecommitdiff
path: root/storage/myisam
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2009-12-102-2/+6
|\
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-1029-339/+524
| |\
| * \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-022-197/+0
| |\ \
| * \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-2527-296/+296
| |\ \ \
| * \ \ \ merging.Alexey Botchkov2009-11-172-2/+6
| |\ \ \ \
| | * | | | Bug#47216 programs should quit if the file specified by --defaults-file ...Alexey Botchkov2009-10-092-2/+6
* | | | | | After merge fix: pthread_mutext_[un]lock -> mysql_mutex_[un]lock.Sergey Vojtovich2009-12-101-2/+2
* | | | | | Merge mysql-next-mr to mysql-next-mr-svoj.Sergey Vojtovich2009-12-0915-3/+90
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Backport from 6.0-codebase.Sergey Vojtovich2009-11-2515-3/+90
| |/ / / /
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-081-2/+46
|\ \ \ \ \
| * \ \ \ \ Merge next-mr -> next-mr-runtimeKonstantin Osipov2009-12-032-197/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Addition to BUG#36573 - myisampack --join does not create destination table Magne Mahre2009-11-251-1/+0
| * | | | | Fix for Bug#36573 myisampack --join does not create destination Magne Mahre2009-11-251-2/+47
| | |_|_|/ | |/| | |
* | | | | WL#2360 Performance schemaMarc Alff2009-12-0428-337/+478
| |/ / / |/| | |
* | | | Manual resolving for the following filesAndrei Elkin2009-12-012-197/+0
|\ \ \ \ | |/ / / |/| | |
| * | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-303-3/+23
| |\ \ \
| * \ \ \ manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-132-197/+0
| |\ \ \ \
| | * | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-042-197/+0
* | | | | | Backport of:Konstantin Osipov2009-11-2427-296/+296
| |_|_|/ / |/| | | |
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-123-3/+23
|\ \ \ \ \
| * \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-063-1/+21
| |\ \ \ \ \
| | * \ \ \ \ Manual merge from mysql-5.1.Alexander Nozdrin2009-11-053-1/+21
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | A follow-up to fix forSergey Vojtovich2009-10-273-1/+21
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-2/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-2/+2
| | | |/ / /
* | | | | | Bug #47139 Test "merge" crashes in "embedded" runAlexey Botchkov2009-11-111-2/+5
|/ / / / /
* | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-212-5/+6
|\ \ \ \ \
| * | | | | Backporting WL#4164 Two-byte collation IDsAlexander Barkov2009-10-152-5/+6
* | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-193-20/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-193-20/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge fix for BUG47073.Sergey Vojtovich2009-10-093-20/+10
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | BUG#47073 - valgrind errs, corruption,failed repair of partition,Sergey Vojtovich2009-10-093-20/+10
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-144-11/+9
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-134-11/+9
| |\ \ \ \ | | |/ / /
| | * | | auto-mergeIngo Struewing2009-10-011-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-1/+1
| | * | | Fixed Sun Studio 8 compilation failures as suggested by Jorgen and reviewedGeorgi Kodinov2009-09-281-2/+4
| | |/ /
| | * | Merge from 5.0Staale Smedseng2009-09-172-8/+4
* | | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-2/+0
* | | | Backport of the patch Vladislav Vaintroub2009-09-301-4/+4
* | | | mergeVladislav Vaintroub2009-09-2311-36/+24
|\ \ \ \ | |/ / /
| * | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-1611-36/+24
| |\ \ \ | | |/ /
| | * | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-09-031-3/+3
| | |/
| | * Merge from 5.0 for 43414Staale Smedseng2009-08-2810-32/+20
| | * Fix for a few assorted compiler warnings.Davi Arnaut2009-08-281-1/+1
* | | This is the downport ofVladislav Vaintroub2009-09-111-4/+4
|/ /
* | Merge from mysql-5.1-bugteamAlexander Nozdrin2009-08-261-2/+8
|\ \ | |/
| * Bug#46639: 1030 (HY000): Got error 124 from storage engine onMattias Jonsson2009-08-211-2/+8
* | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-8/+3
|\ \ | |/