Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -8/+7 |
|\ | |||||
| * | fixed "engine not found" error in open_binary_frm | Sergei Golubchik | 2009-12-23 | 1 | -2/+2 |
| * | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -6/+5 |
* | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -7/+37 |
|\ \ | |/ |/| | |||||
| * | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -7/+19 |
| |\ | |||||
| | * | merge mysql-5.1-rep+2 --> mysql-5.1-rep+3 | Alfranio Correia | 2009-12-14 | 1 | -0/+18 |
| | |\ | |||||
| | * \ | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -113/+13 |
| | |\ \ | |||||
| | * \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -10/+10 |
| | |\ \ \ | |||||
| | * \ \ \ | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -3/+76 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -6/+18 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | post-push fixes for BUG#39934 | Sven Sandberg | 2009-08-19 | 1 | -2/+2 |
| | | * | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 1 | -7/+10 |
| | | * | | | | | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -3/+12 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -3/+12 |
| * | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 1 | -100/+197 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | WL#5142 FLUSH LOGS should take optional arguments for which log(s) to flush | unknown | 2009-12-03 | 1 | -0/+18 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-19 | 1 | -72/+125 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -72/+125 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -72/+127 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Automerge | Alexey Kopytov | 2009-12-13 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Bug #42849: innodb crash with varying time_zone on partitioned | Alexey Kopytov | 2009-12-13 | 1 | -1/+1 |
| | | | | |_|_|_|/ / / | | | | |/| | | | | | | |||||
| | | * | | | | | | | | merge of bug #49250 to 5.1-bugteam | Georgi Kodinov | 2009-12-11 | 1 | -72/+125 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | Bug #49250 : spatial btree index corruption and crash | Georgi Kodinov | 2009-12-10 | 1 | -41/+65 |
* | | | | | | | | | | | Backport of fix for bug#35020 | Martin Hansson | 2009-12-17 | 1 | -34/+84 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -100/+197 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -305/+696 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Automerge. | Davi Arnaut | 2009-11-25 | 1 | -12/+33 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge | Kristofer Pettersson | 2009-11-20 | 1 | -12/+25 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -12/+25 |
| | * | | | | | | | | | | BUG#47995: Mark system functions as unsafe | Sven Sandberg | 2009-11-18 | 1 | -0/+8 |
| * | | | | | | | | | | | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crash | Davi Arnaut | 2009-11-12 | 1 | -88/+164 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Fix merge mistake. | Alexander Nozdrin | 2009-12-02 | 1 | -2/+2 |
* | | | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 1 | -108/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -107/+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 | -3/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -110/+11 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -110/+11 |
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | * | | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -10/+10 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | merge | Mattias Jonsson | 2009-11-24 | 1 | -17/+19 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -17/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -17/+19 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Backport of Bug#27249 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -7/+9 |
| | | * | | | | | | | | | Backport of Bug#27525 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -10/+10 |
* | | | | | | | | | | | | merge of bug#35765 into mysql-next-mr-bugfixing | Mattias Jonsson | 2009-11-24 | 1 | -1/+2 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | merge of Bug#33204 (backport) | Martin Hansson | 2009-11-20 | 1 | -190/+239 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 1 | -190/+239 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | merge | Georgi Kodinov | 2009-10-30 | 1 | -2/+1 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | Bug #48293: crash with procedure analyse, view with > 10 columns, | Georgi Kodinov | 2009-10-30 | 1 | -2/+1 |
| | | | * | | | | | | | | Bug#34895 'show procedure status' or 'show function status' + | Kristofer Pettersson | 2009-09-30 | 1 | -4/+0 |