Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 1 | -6/+7 |
|\ | |||||
| * | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 1 | -1/+1 |
| |\ | |||||
| * | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -6/+7 |
* | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -1/+0 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 1 | -1/+0 |
* | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-04 | 1 | -1/+11 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | WL#2360 Performance schema | Marc Alff | 2009-11-30 | 1 | -1/+11 |
| |/ / | |||||
* | | | Bug#47126 equal flag values causing unexpected behaviour | Alexey Botchkov | 2009-11-11 | 1 | -1/+1 |
|/ / | |||||
* | | WL#4903 Plugin Service API part I | Sergei Golubchik | 2009-11-02 | 1 | -0/+2 |
* | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -0/+1 |
|\ \ | |||||
| * | | Backport BUG#25192 Using relay-log and relay-log-index without values produce... | He Zhenxing | 2009-10-02 | 1 | -0/+1 |
* | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 1 | -2/+5 |
|\ \ \ | |||||
| * | | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 1 | -1/+3 |
| * | | | Backporting WL#4164 Two-byte collation IDs | Alexander Barkov | 2009-10-15 | 1 | -1/+2 |
* | | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-19 | 1 | -1/+0 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clash | Magnus BlÄudd | 2009-10-06 | 1 | -1/+0 |
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -0/+10 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+10 |
* | | | backport of | Vladislav Vaintroub | 2009-09-30 | 1 | -1/+1 |
* | | | merge mysql-next-mr-alik | Vladislav Vaintroub | 2009-09-24 | 1 | -11/+20 |
|\ \ \ | |||||
| * \ \ | Merge mysql-next-mr --> mysql-trunk-signal | Marc Alff | 2009-09-17 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| * | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -11/+20 |
| | |/ | |/| | |||||
* | | | merge | Vladislav Vaintroub | 2009-09-23 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-09-03 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabled for | Satya B | 2009-09-03 | 1 | -0/+1 |
| | * | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -1/+1 |
| | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -1/+2 |
| | |\ | |||||
| | | * | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -0/+1 |
| | | |\ | |||||
| | | * | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -1/+1 |
| | * | | | Buq#32167 another privilege bypass with DATA/INDEX DIRECTORY. | Alexey Botchkov | 2008-07-31 | 1 | -0/+1 |
| | * | | | Merge fix for bug#38180 from mysql-5.0.66a-release | Jonathan Perkin | 2008-07-18 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -0/+6 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -0/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Push history-limiting code until after the code that adds new | unknown | 2007-11-14 | 1 | -0/+1 |
* | | | | | | | | This is the downport of | Vladislav Vaintroub | 2009-09-11 | 1 | -6/+18 |
|/ / / / / / / | |||||
* | | | | | | | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSX | Georgi Kodinov | 2009-06-05 | 1 | -1/+1 |
* | | | | | | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -4/+4 |
|/ / / / / / / | |||||
* | | | | | | | Manual merge of patch for bug #40552 into the team tree. | Alexey Kopytov | 2009-03-16 | 1 | -2/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix for bug #40552: Race condition around default_directories | Alexey Kopytov | 2009-02-27 | 1 | -2/+5 |
* | | | | | | | | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteam | He Zhenxing | 2009-03-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | BUG#22082 Slave hangs(holds mutex) on "disk full" | He Zhenxing | 2009-03-06 | 1 | -0/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Bug#37995 Error message truncation in test "innodb" in embedded mode. | Alexey Botchkov | 2009-02-05 | 1 | -3/+0 |
* | | | | | | merging | Alexey Botchkov | 2008-08-23 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. | Alexey Botchkov | 2008-08-22 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fix merge problem: make sf_malloc_cur_memory definitions match in headers and... | Sergey Petrunia | 2008-08-20 | 1 | -1/+1 |
* | | | | | Up-merge 5.0.66a-release changes (via 5.0) into 5.1. | Timothy Smith | 2008-07-17 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnf | Timothy Smith | 2008-07-16 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
| * | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl | unknown | 2008-01-30 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |/| | |