Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove errmsg.txt and errmsg-cnv.sh. Use errmsg-utf8.txt instead. | Alexander Nozdrin | 2010-02-05 | 1 | -6312/+0 |
* | Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2010-02-02 | 1 | -0/+4 |
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 1 | -1/+2 |
|\ | |||||
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -5/+6 |
| |\ | |||||
| | * | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -4/+4 |
* | | | Removes duplicate entry for ER_SLAVE_IGNORE_SERVER_IDS | Luis Soares | 2010-01-20 | 1 | -2/+0 |
* | | | Fix for perfschema.binlog_stmt failure: | unknown | 2010-01-15 | 1 | -1/+1 |
* | | | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -1/+7 |
* | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * \ \ \ | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-23 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | Bug #47863 binlog_format should be writable only at transaction boundaries | unknown | 2009-12-23 | 1 | -0/+2 |
* | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -2/+41 |
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | |||||
| * | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -5/+38 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -4/+4 |
| | |\ \ \ | |||||
| | * \ \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -1/+7 |
| | |\ \ \ \ | |||||
| | * | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -0/+2 |
| | * | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -1/+4 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-10-14 | 1 | -6/+4 |
| | * | | | | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -2/+36 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | post-push fixes for BUG#39934 | Sven Sandberg | 2009-08-19 | 1 | -0/+20 |
| | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -2/+16 |
| * | | | | | | | | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 1 | -0/+5 |
* | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Automerge | Alexey Kopytov | 2009-12-13 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | | * | | | | | | Bug #42849: innodb crash with varying time_zone on partitioned | Alexey Kopytov | 2009-12-13 | 1 | -2/+2 |
* | | | | | | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -4/+4 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Backport of Bug#36785 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -0/+1 |
* | | | | | | | Merged WL#3352 into mysql-next-mr | Mikael Ronstrom | 2009-10-28 | 1 | -0/+18 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | BUG#48165, needed to introduce length restrictions on partitioning fields to ... | Mikael Ronstrom | 2009-10-28 | 1 | -0/+2 |
| * | | | | | | A lot of fixes to make character set work ok, first step to fixing BUG#48163 | Mikael Ronstrom | 2009-10-22 | 1 | -1/+3 |
| * | | | | | | Added checks for no NULL values in VALUES LESS THAN, added tests for no MAXVA... | Mikael Ronstrom | 2009-10-21 | 1 | -2/+2 |
| * | | | | | | Merge | Mikael Ronstrom | 2009-10-21 | 1 | -22/+22 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | WL#3352: Extending Partitioning Types and new partition function | Mattias Jonsson | 2009-10-20 | 1 | -10/+10 |
| | * | | | | | | Manual merge mysql-trunk -> mysql-trunk-wl3352 | Mattias Jonsson | 2009-10-19 | 1 | -8/+8 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| * | | | | | | | Merged in latest changes | Mikael Ronstrom | 2009-10-16 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Removed GLOBAL INDEX syntax, need to develop GLOBAL indexes before adding syn... | Mikael Ronstrom | 2009-10-16 | 1 | -2/+0 |
| * | | | | | | | Fixed removal of column_list keyword for VALUES part, retained for PARTITION ... | Mikael Ronstrom | 2009-10-16 | 1 | -2/+6 |
| |/ / / / / / | |||||
| * | | | | | | BUG#47837, Duplicate field names were allowed in both column list partitionin... | Mikael Ronstrom | 2009-10-06 | 1 | -0/+2 |
| * | | | | | | WL#3352, Introducing Column list partitioning, makes it possible to partition... | Mikael Ronstrom | 2009-09-15 | 1 | -0/+10 |
* | | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Backport BUG#34227 Replication permission error message is misleading | He Zhenxing | 2009-10-02 | 1 | -1/+1 |
| * | | | | | | backporting bug@27808 fixes | Andrei Elkin | 2009-10-01 | 1 | -0/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -1/+8 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | |