Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -3/+3 |
|\ | |||||
| * | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -3/+3 |
* | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -43/+51 |
|\ \ | |/ |/| | |||||
| * | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -45/+47 |
| |\ | |||||
| | * | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -8/+9 |
| | |\ | |||||
| | * \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -39/+48 |
| | |\ \ | |||||
| | * | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -14/+23 |
| | * | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -31/+24 |
| | |\ \ \ | |||||
| | | * | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 1 | -1/+1 |
| | | * | | | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -28/+21 |
| | | |\ \ \ | |||||
| | | | * | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -28/+21 |
* | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 1 | -87/+90 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc | Marc Alff | 2009-12-16 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 1 | -20/+48 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -87/+90 |
* | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Auto-merge. | Ramil Kalimullin | 2009-12-17 | 1 | -1/+10 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Fix for bug#49465: valgrind warnings and incorrect live checksum... | Ramil Kalimullin | 2009-12-17 | 1 | -1/+10 |
* | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -35/+61 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Bug #47682 strange behaviour of INSERT DELAYED | Jon Olav Hauglid | 2009-11-18 | 1 | -0/+16 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
* | | | | | | | | | | Auto-merge from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2009-12-10 | 1 | -20/+31 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -202/+203 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Auto merge | He Zhenxing | 2009-11-21 | 1 | -15/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -9/+5 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioning | Mattias Jonsson | 2009-11-20 | 1 | -6/+0 |
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return result | He Zhenxing | 2009-11-21 | 1 | -20/+31 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge mysql-next-mr to mysql-next-mr-svoj. | Sergey Vojtovich | 2009-12-09 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | WL#4454 change sql_insert.cc::last_uniq_key to match keys in any order | V Narayanan | 2009-12-03 | 1 | -0/+17 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | (no commit message) | Konstantin Osipov | 2009-11-24 | 1 | -198/+193 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove handle_delayed_insert_impl(). | Alexander Nozdrin | 2009-11-24 | 1 | -198/+193 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -10/+10 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -9/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Backport of Bug#15192 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -9/+5 |
* | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -8/+9 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -8/+9 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -8/+9 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -17/+37 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | #41760 Inserting into multiple-table views is not working | Evgeny Potemkin | 2009-10-20 | 1 | -17/+37 |
* | | | | | | | | Bug #43054 Assertion `!table->auto_increment_field_not_null' failed when ... | Magne Mahre | 2009-10-15 | 1 | -0/+1 |
* | | | | | | | | Backport of revno: 2617.81.4 | Jon Olav Hauglid | 2009-10-14 | 1 | -0/+6 |
|/ / / / / / / | |||||
* | | | | | | | Backport of this changeset | Vladislav Vaintroub | 2009-09-30 | 1 | -5/+0 |
* | | | | | | | Merge mysql-next-mr --> mysql-trunk-signal | Marc Alff | 2009-09-17 | 1 | -39/+48 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2009-09-16 | 1 | -39/+48 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | A patch for Bug#45118 (mysqld.exe crashed in debug mode | Alexander Nozdrin | 2009-09-10 | 1 | -38/+47 |
| | * | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-09-04 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | | | |||||
| | | * | | | Fix for BUG#46384 - mysqld segfault when trying to create table with same | Satya B | 2009-09-04 | 1 | -1/+1 |
* | | | | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -13/+17 |
|/ / / / / |