| Commit message (Expand) | Author | Age | Files | Lines |
* | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -0/+19 |
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -0/+2 |
|\ |
|
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-02-09 | 1 | -0/+2 |
| |\ |
|
| | * | Bug #45640: optimizer bug produces wrong results | Gleb Shchepa | 2010-02-06 | 1 | -0/+2 |
| * | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-02-03 | 1 | -25/+0 |
| |\ \
| | |/ |
|
| | * | Revert a patch for Bug#48231, which introduced valgrind warnings. | Alexander Nozdrin | 2010-02-02 | 1 | -25/+0 |
| * | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -0/+25 |
| |\ \
| | |/ |
|
| | * | Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; | unknown | 2010-01-30 | 1 | -0/+25 |
* | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -7/+11 |
|\ \ \ |
|
| * \ \ | Merge mysql-next-mr-marc --> mysql-next-mr-bugfixing | Marc Alff | 2010-02-05 | 1 | -1/+3 |
| |\ \ \ |
|
| | * | | | Bug#34455 Ambiguous foreign keys syntax is accepted | Marc Alff | 2010-01-25 | 1 | -1/+3 |
| * | | | | Bug #50192 Strange effect in replication test, trigger, auto_increment | Andrei Elkin | 2010-01-29 | 1 | -6/+8 |
| |/ / / |
|
* | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -17/+168 |
|\ \ \ \
| |/ / / |
|
| * | | | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -3/+11 |
| |\ \ \ |
|
| * \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -17/+169 |
| |\ \ \ \ |
|
| | * \ \ \ | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -3/+3 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -7/+0 |
| | |\ \ \ \ \ |
|
| | * | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -0/+7 |
| | * | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -3/+9 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-10-14 | 1 | -0/+5 |
| | * | | | | | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -17/+158 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | post-push fixes for BUG#39934 | Sven Sandberg | 2009-08-19 | 1 | -1/+1 |
| | | * | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 1 | -42/+136 |
| | | * | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -10/+57 |
* | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -3/+11 |
|\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ / /
| |/| | | | | | | | |
|
| * | | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -3/+11 |
| |/ / / / / / / / |
|
* | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-16 | 1 | -6/+22 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / / |
|
| * | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Bug#49165 Remove unused/confusing code/comments in setup_conds() | Tor Didriksen | 2009-11-27 | 1 | -5/+0 |
| * | | | | | | | | | backport of: | Tor Didriksen | 2009-11-30 | 1 | -1/+22 |
* | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-15 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / |
|
| * | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 1 | -16/+23 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ /
| | |/| | | | | | | |
|
| * | | | | | | | | | Bug#9801 Views: imperfect error message | Marc Alff | 2009-11-02 | 1 | -0/+11 |
* | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-08 | 1 | -0/+17 |
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | / /
| | |_|_|_|_|/ /
| |/| | | | | | |
|
| * | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -3/+3 |
| |\ \ \ \ \ \ \
| | |_|_|_|_|/ /
| |/| | | | | | |
|
| | * | | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -3/+3 |
| | | |_|_|/ /
| | |/| | | | |
|
| * | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -7/+0 |
| |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | /
| | | |_|_|/
| | |/| | | |
|
* | | | | | | Merge | Mikael Ronstrom | 2009-11-03 | 1 | -13/+20 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -1/+1 |
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| * | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -3/+9 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -7/+0 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -1/+6 |
| * | | | | | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -12/+12 |
| * | | | | | | | | This patch is prerequisite for the 2nd milestone of WL#148 "Foreign keys" | Dmitry Lenev | 2009-10-09 | 1 | -0/+2 |
* | | | | | | | | | Merge to latest mysql-next-mr | Mikael Ronstrom | 2009-11-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \
| | |_|_|/ / / / /
| |/| | | | | | | |
|
| * | | | | | | | | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 1 | -3/+9 |
| |\ \ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | | |
|
| * | | | | | | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to Betony | Sergey Glukhov | 2009-10-23 | 1 | -1/+1 |
| | |_|/ / / / /
| |/| | | | | | |
|
* | | | | | | | | Merged WL#3352 into mysql-next-mr | Mikael Ronstrom | 2009-10-28 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
| * | | | | | | | Removed GLOBAL INDEX syntax, need to develop GLOBAL indexes before adding syn... | Mikael Ronstrom | 2009-10-16 | 1 | -3/+0 |