Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 4 | -24/+14 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Backporting patch for Bug#47756 | Alexander Nozdrin | 2009-12-15 | 1 | -0/+3 | |
| | * | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-23 | 2 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Manual merge. | Davi Arnaut | 2009-12-18 | 2 | -3/+3 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 2 | -3/+3 | |
* | | | | | | | | | | | | | | | | Fix AIX error during compile in my_handler (pointer to data is used, while po... | Vladislav Vaintroub | 2010-01-19 | 1 | -1/+5 | |
* | | | | | | | | | | | | | | | | Fix various compiler/OS compatibility errors | Vladislav Vaintroub | 2010-01-19 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | Bug#50362: | Vladislav Vaintroub | 2010-01-16 | 1 | -14/+15 | |
* | | | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2010-01-14 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-11 | 1 | -6/+6 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2010-01-11 | 3 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 3 | -5/+6 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-25 | 4 | -172/+386 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | my_once.c: clarify the comment | Sergei Golubchik | 2009-12-26 | 1 | -2/+3 | |
| * | | | | | | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 3 | -170/+383 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-19 | 5 | -57/+84 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 27 | -379/+640 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -1/+5 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -1/+5 | |
| * | | | | | | | | | | | | Auto-merge from mysql-next-mr-summit0.3. | Alexander Nozdrin | 2009-12-16 | 2 | -9/+64 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 4 | -55/+79 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 3 | -54/+59 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Bug#49134 5.1 server segfaults with 2byte collation file | Alexander Barkov | 2009-12-15 | 1 | -1/+2 | |
| | | * | | | | | | | | | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 3 | -53/+57 | |
| | * | | | | | | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 1 | -10/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -1/+20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge from 5.0 | Staale Smedseng | 2009-12-06 | 1 | -1/+20 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-19 | 30 | -386/+702 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc | Marc Alff | 2009-12-17 | 2 | -9/+64 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge to latest mysql-next-mr | Mikael Ronstrom | 2009-12-16 | 4 | -24/+14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge | Mikael Ronstrom | 2009-12-14 | 6 | -20/+120 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merged in WL#5105 | Mikael Ronstrom | 2009-11-27 | 1 | -0/+24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | WL#5105, review fix | Mikael Ronstrom | 2009-11-20 | 1 | -5/+5 | |
| | | * | | | | | | | | | | | | WL#5105, Optimize ptr_cmp on Solaris by using memcmp instead of native ptr_cmp | Mikael Ronstrom | 2009-11-20 | 1 | -0/+24 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | WL#5105, ptr_cmp optimised on Solaris, more efficient to use memcmp on Solari... | Mikael Ronstrom | 2009-09-23 | 1 | -0/+24 | |
| | * | | | | | | | | | | | | | | Merge WL#5137 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -9/+40 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | WL#5137, Remove hash calculation from LOCK_open in open_table | Mikael Ronstrom | 2009-11-20 | 1 | -9/+40 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | Review comments for LOCK_open patch | Mikael Ronstrom | 2009-11-10 | 1 | -10/+16 | |
| | | | * | | | | | | | | | | | | | A minor change to MySQL's hash where calculation of hash can be done separate... | Mikael Ronstrom | 2009-10-09 | 1 | -2/+27 | |
| * | | | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc | Marc Alff | 2009-12-16 | 4 | -24/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 2 | -5/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 27 | -376/+637 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-16 | 4 | -24/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | |