Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 3 | -4/+45 |
|\ | |||||
| * | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 3 | -2/+43 |
| |\ | |||||
| | * | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 3 | -2/+43 |
* | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 1 | -14/+0 |
|\ \ \ | |/ / | |||||
| * | | Remove .cvsignore files (attempt #2). | Alexander Nozdrin | 2009-12-16 | 1 | -14/+0 |
* | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 5 | -17/+19 |
| |\ \ | |||||
| * \ \ | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -2/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug #47930: MATCH IN BOOLEAN MODE returns too many results | Georgi Kodinov | 2009-10-27 | 1 | -2/+1 |
* | | | | Auto-merge from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2009-12-10 | 2 | -2/+6 |
|\ \ \ \ | |||||
| * \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-10 | 29 | -339/+524 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 2 | -197/+0 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 27 | -296/+296 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merging. | Alexey Botchkov | 2009-11-17 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ... | Alexey Botchkov | 2009-10-09 | 2 | -2/+6 |
* | | | | | | | | After merge fix: pthread_mutext_[un]lock -> mysql_mutex_[un]lock. | Sergey Vojtovich | 2009-12-10 | 1 | -2/+2 |
* | | | | | | | | Merge mysql-next-mr to mysql-next-mr-svoj. | Sergey Vojtovich | 2009-12-09 | 15 | -3/+90 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Backport from 6.0-codebase. | Sergey Vojtovich | 2009-11-25 | 15 | -3/+90 |
| |/ / / / / / | |||||
* | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-08 | 1 | -2/+46 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge next-mr -> next-mr-runtime | Konstantin Osipov | 2009-12-03 | 2 | -197/+0 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Addition to BUG#36573 - myisampack --join does not create destination table | Magne Mahre | 2009-11-25 | 1 | -1/+0 |
| * | | | | | | | Fix for Bug#36573 myisampack --join does not create destination | Magne Mahre | 2009-11-25 | 1 | -2/+47 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 28 | -337/+478 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 2 | -197/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 3 | -3/+23 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 2 | -197/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 2 | -197/+0 |
* | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 27 | -296/+296 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 3 | -3/+23 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 3 | -1/+21 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 3 | -1/+21 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | A follow-up to fix for | Sergey Vojtovich | 2009-10-27 | 3 | -1/+21 |
| * | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -2/+2 |
| | | |/ / / | |||||
* | | | | | | Bug #47139 Test "merge" crashes in "embedded" run | Alexey Botchkov | 2009-11-11 | 1 | -2/+5 |
|/ / / / / | |||||
* | | | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 2 | -5/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Backporting WL#4164 Two-byte collation IDs | Alexander Barkov | 2009-10-15 | 2 | -5/+6 |
* | | | | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-19 | 3 | -20/+10 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-19 | 3 | -20/+10 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge fix for BUG47073. | Sergey Vojtovich | 2009-10-09 | 3 | -20/+10 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | BUG#47073 - valgrind errs, corruption,failed repair of partition, | Sergey Vojtovich | 2009-10-09 | 3 | -20/+10 |
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 4 | -11/+9 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | |||||
| * | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-13 | 4 | -11/+9 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | auto-merge | Ingo Struewing | 2009-10-01 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -1/+1 |
| | * | | | Fixed Sun Studio 8 compilation failures as suggested by Jorgen and reviewed | Georgi Kodinov | 2009-09-28 | 1 | -2/+4 |
| | |/ / | |||||
| | * | | Merge from 5.0 | Staale Smedseng | 2009-09-17 | 2 | -8/+4 |
* | | | | Backport http://lists.mysql.com/commits/57778 | Vladislav Vaintroub | 2009-09-30 | 1 | -2/+0 |
* | | | | Backport of the patch | Vladislav Vaintroub | 2009-09-30 | 1 | -4/+4 |