| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-14 | 64 | -0/+16877 |
| |\ | |||||
| | * | WL#2360 Performance schema | Marc Alff | 2010-01-11 | 64 | -0/+16877 |
| * | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -2/+2 |
| * | | Manual merge from next-mr. | unknown | 2010-01-12 | 8 | -40/+101 |
| |\ \ | |/ | |||||
| | * | merged | Sergei Golubchik | 2009-12-24 | 6 | -21/+28 |
| | |\ | |||||
| | | * | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-24 | 1 | -1/+0 |
| | | |\ | |||||
| | | | * | Postfix for Bug#37408 (fix for Bug#49898). | Alexander Nozdrin | 2009-12-24 | 1 | -1/+0 |
| | | | * | Backporting fix for Bug#49834 from mysql-next-mr-bugfixing | Alexander Nozdrin | 2009-12-23 | 1 | -1/+6 |
| | | | * | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-22 | 7 | -46/+46 |
| | | | |\ | |||||
| | | | | * | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-19 | 7 | -39/+46 |
| | | | | |\ | |||||
| | * | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 8 | -39/+101 |
| * | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 3 | -7/+21 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 4 | -23/+36 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 28 | -347/+374 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 111 | -2534/+2585 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -0/+8 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 4 | -34/+35 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 1 | -4/+3 |
| | | | * | | | | | | | | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 3 | -20/+26 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 3 | -20/+26 |
| | * | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 79 | -502/+1654 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-23 | 4 | -19/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-22 | 8 | -49/+49 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Automerge the changes of version 5.5.0-m2. | Joerg Bruehe | 2009-12-16 | 4 | -19/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Automerge the build fixes of 5.5.0-m2 back into the tree. | Joerg Bruehe | 2009-12-16 | 4 | -19/+22 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | Type change: "fk->name" is no "const char *" any more, rather a "LEX_STRING". | MySQL Build Team | 2009-11-17 | 1 | -5/+5 |
| | | | * | | | | | | | | | | | The "hash_*" functions have got a prefix "my_" in 2008. | MySQL Build Team | 2009-11-17 | 2 | -12/+12 |
| | | | * | | | | | | | | | | | Add missing cleanup, needed for "make distcheck" to succeed. | MySQL Build Team | 2009-11-13 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | Solve a "make" rule issue in the context of dtarce and shared objects: | MySQL Build Team | 2009-11-13 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | Bug#49834 - fixed a bug introduced by mismerge. | Vladislav Vaintroub | 2009-12-22 | 1 | -1/+6 |
| | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix inconsistently defined THR_LOCK_myisam_mmap | Vladislav Vaintroub | 2009-12-20 | 2 | -9/+9 |
| * | | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-19 | 8 | -42/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc | Marc Alff | 2009-12-16 | 66 | -346/+1338 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 19 | -23/+183 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | 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 |
| | * | | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 4 | -37/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -6/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | Fix for BUG#49502 - CMake error compiling 5.1 on Windows | Satya B | 2009-12-14 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 3 | -23/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 3 | -31/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | merging with mysql-5.1-bugteam | V Narayanan | 2009-12-11 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | Bug#49329 example (and other) engines use wrong collation for open tables hash | V Narayanan | 2009-12-11 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | Bug#49521 SHOW CREATE TABLE on IBMDB2I tables has incorrect fk constraint format | V Narayanan | 2009-12-11 | 1 | -27/+1 |
| | | | |/ / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | Bug #38883: thd_security_context is not thread safe, crashes? | Gleb Shchepa | 2009-12-03 | 2 | -9/+0 |
| | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-18 | 1 | -7/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |