Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 1 | -10/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Remove .cvsignore files (attempt #2). | Alexander Nozdrin | 2009-12-16 | 1 | -10/+0 | |
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 3 | -14/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | / / / / / / / / | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 41 | -563/+1560 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | ||||||
| | * | | | | | | | | | Automerge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-01 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Move DBG_* macros to after the variable declaration section in a | Kent Boortz | 2009-11-25 | 1 | -2/+2 | |
| | * | | | | | | | | | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Additional fix for bug #45613: handle failures from my_hash_insert | Georgi Kodinov | 2009-11-23 | 1 | -1/+0 | |
| | | * | | | | | | | | merge | Kristofer Pettersson | 2009-11-20 | 1 | -0/+1 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -0/+1 | |
| | | * | | | | | | | | | merge | Georgi Kodinov | 2009-11-20 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | Use C comments in C code | unknown | 2009-11-05 | 1 | -1/+1 | |
| | * | | | | | | | | | | | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -11/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Bug#46043 mysqld --skip-innodb does not skip InnoDB | Kristofer Pettersson | 2009-11-09 | 1 | -11/+11 | |
| | | |/ / / / / / / / / | ||||||
* | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-11 | 2 | -5/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-10 | 1 | -3/+45 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Bug#47756 Setting 2byte collation ID with 'set names' crashes the server | Alexander Barkov | 2009-12-07 | 1 | -0/+3 | |
| * | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-04 | 2 | -3/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 1 | -9/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Auto-merge (pull) from mysql-next-mr. | Alexander Nozdrin | 2009-11-26 | 4 | -5/+1052 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 18 | -113/+60 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-23 | 8 | -16/+1307 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 2 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | merging. | Alexey Botchkov | 2009-11-17 | 1 | -5/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ... | Alexey Botchkov | 2009-10-09 | 1 | -5/+9 | |
* | | | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-10 | 1 | -3/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 1 | -3/+45 | |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | couple of tweaks for solaris on sparc, link with librt, as it defines sched_y... | Vladislav Vaintroub | 2009-12-08 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | On Linux, support -Wl,--no-undefined (only client shared library) | Vladislav Vaintroub | 2009-12-07 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-04 | 2 | -3/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2927) --> mysql-next-mr-marc | Marc Alff | 2009-12-02 | 1 | -9/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-11-30 | 2 | -3/+31 | |
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-02 | 1 | -9/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -9/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 2 | -2/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | BUG#42150: binlog_start_comment.test failed: Error writing file 'UNOPENED' | Luis Soares | 2009-11-24 | 1 | -9/+32 | |
| | * | | | | | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 11 | -114/+157 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | fix build errors | Vladislav Vaintroub | 2009-12-01 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-11-30 | 4 | -5/+1058 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 18 | -113/+60 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | WL#2373 Use cycle counter for timing | Marc Alff | 2009-11-24 | 4 | -5/+1052 | |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-11-25 | 18 | -113/+60 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-24 | 8 | -16/+1307 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 17 | -59/+57 | |
| * | | | | | | | | | | | | | A follow up for the fix for Bug#35164 (remove priorities on Windows). | Konstantin Osipov | 2009-11-23 | 1 | -7/+0 | |
| * | | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 2 | -48/+4 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | add --disable-shared equivalent | Vladislav Vaintroub | 2009-11-25 | 1 | -3/+0 | |
* | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-11-25 | 8 | -16/+1307 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge mysql-next-mr (revno 2923) --> mysql-next-mr-marc | Marc Alff | 2009-11-20 | 2 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Port the unit test framework to windows | Marc Alff | 2009-11-17 | 1 | -1/+3 |