Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge backport of WL#3771 with mysql-next-mr. | Sergey Vojtovich | 2010-01-19 | 1 | -0/+5 |
|\ | |||||
| * | Merge backport of WL#3771 with mysql-next-mr. | Sergey Vojtovich | 2010-01-19 | 1 | -0/+5 |
| |\ | |||||
| | * | Backport from 6.0-codebase. | Sergey Vojtovich | 2009-12-15 | 1 | -0/+5 |
* | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -48/+76 |
|\ \ \ | |/ / | |||||
| * | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -48/+76 |
* | | | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -39/+30 |
|\ \ \ | |/ / | |||||
| * | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -35/+25 |
* | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -75/+524 |
|\ \ \ | |/ / |/| | | |||||
| * | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -75/+524 |
| |\ \ | |||||
| | * \ | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -15/+54 |
| | |\ \ | |||||
| | * \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -0/+40 |
| | |\ \ \ | |||||
| | * | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -16/+104 |
| | * | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -3/+36 |
| | |\ \ \ \ | |||||
| | * | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-10-14 | 1 | -60/+32 |
| | * | | | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -62/+451 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | post-push fixes for BUG#39934 | Sven Sandberg | 2009-08-19 | 1 | -14/+15 |
| | | * | | | | | Post-push fixes for BUG#39934 | Sven Sandberg | 2009-07-22 | 1 | -3/+16 |
| | | * | | | | | Post-push fix for BUG#39934 | Sven Sandberg | 2009-07-22 | 1 | -0/+292 |
| | | * | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 1 | -29/+94 |
| | | * | | | | | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -52/+70 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -51/+70 |
| * | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -13/+52 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -0/+40 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc | Marc Alff | 2009-12-17 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge to latest mysql-next-mr | Mikael Ronstrom | 2009-12-16 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge | Mikael Ronstrom | 2009-12-14 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge WL#5138 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -5/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | WL#5138, Fixed according to code review comments from Davi | Mikael Ronstrom | 2009-11-24 | 1 | -0/+20 |
* | | | | | | | | | | | | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc | Marc Alff | 2009-12-16 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -247/+313 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | / / / / | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Bug #38883 (reopened): thd_security_context is not thread safe, crashes? | Gleb Shchepa | 2009-12-01 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -5/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | merge of Bug#33204 (backport) | Martin Hansson | 2009-11-20 | 1 | -97/+105 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Backport of Bug#33204 from mysql-pe to | Martin Hansson | 2009-11-10 | 1 | -1/+0 |
* | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -9/+9 |
| |_|/ / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -4/+0 |
* | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-20 | 1 | -1/+1 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-10 | 1 | -18/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-05 | 1 | -66/+51 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | WL#4903 Plugin Service API part I | Sergei Golubchik | 2009-11-02 | 1 | -18/+2 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -2/+19 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | BUG#42829: manually merged approved bzr bundle from bug report. | Luis Soares | 2009-11-01 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | BUG#42829: binlogging enabled for all schemas regardless of | Luis Soares | 2009-09-24 | 1 | -0/+6 |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| * | | | | | | | | | merge | Georgi Kodinov | 2009-10-30 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Bug #48291 : crash with row() operator,select into @var, and | Georgi Kodinov | 2009-10-30 | 1 | -2/+4 |
| * | | | | | | | | | A patch and a test case for | Konstantin Osipov | 2009-10-28 | 1 | -0/+10 |
* | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -11/+33 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | |