Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 3 | -0/+88 |
|\ | |||||
| * | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE... | Rohit Kalhans | 2011-09-29 | 3 | -0/+88 |
* | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 19 | -1038/+1702 |
|\ \ | |||||
| * \ | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 2 | -2/+2 |
| |\ \ | |||||
| | * | | bug in the test case fixed | Sergei Golubchik | 2011-02-01 | 2 | -2/+2 |
| * | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 10 | -0/+114 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 10 | -0/+114 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 10 | -0/+114 |
| | | |\ \ \ | |||||
| * | | \ \ \ | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 6 | -1024/+218 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 6 | -1024/+218 |
| * | | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 9 | -5/+1476 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | MWL#116: After-review fixes. | unknown | 2011-04-07 | 2 | -187/+0 |
| | * | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 30 | -131/+776 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge MWL#116 after-review fixes. | unknown | 2011-03-31 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | MWL#116: After-review fixes. | unknown | 2011-03-31 | 1 | -1/+2 |
| | * | | | | | | | | Merge fix for lp:697174 | unknown | 2011-01-27 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | lp:697174: Do not put absolute path in status variable binlog_snapshot_file. | unknown | 2011-01-27 | 1 | -4/+4 |
| | * | | | | | | | | | After-merge fixes for MWL#47 (which causes changes in binlog positions in .re... | unknown | 2011-01-27 | 1 | -30/+30 |
| | * | | | | | | | | | Merge three Percona patches into mariadb-5.2-rpl: | unknown | 2011-01-26 | 7 | -5/+1418 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 7 | -5/+1418 |
| | * | | | | | | | | | | Merge MWL#136 into mariadb-5.2-rpl | unknown | 2010-12-25 | 2 | -0/+187 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | MWL#136: Rename binlog_trx_{file,position} to the much better binlog_snapshot... | unknown | 2010-11-08 | 2 | -16/+16 |
| | | * | | | | | | | | | MWL#136: Cross-engine consistency for START TRANSACTION WITH CONSISTENT SNAPSHOT | unknown | 2010-11-07 | 2 | -0/+187 |
| | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge MWL#116 into mariadb-5.2-rpl. | unknown | 2010-12-25 | 2 | -0/+57 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Fix error insert to have deterministic errno (fixes test failure on mac). | unknown | 2010-11-02 | 1 | -2/+2 |
| | | * | | | | | | | Merge latest MariaDB 5.1 into MWL#116. | unknown | 2010-11-01 | 4 | -2/+27 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge with latest MariaDB 5.1 | unknown | 2010-10-01 | 22 | -1613/+1807 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | MWL#116: Efficient group commit for binary log | unknown | 2010-09-30 | 2 | -0/+57 |
| * | | | | | | | | | | | merge | Vladislav Vaintroub | 2011-03-26 | 4 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi... | Michael Widenius | 2011-03-23 | 4 | -3/+6 |
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 30 | -131/+776 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 29 | -129/+776 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 29 | -129/+776 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | MBug#702303: Spurious `use` statements in output from mysqlbinlog --rewrite-d... | unknown | 2011-01-13 | 1 | -2/+0 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 3 | -9/+10 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 2 | -8/+8 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 3 | -2/+5 |
* | | | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 51 | -147/+1263 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merged BUG#12574820 from 5.1 to 5.5 | Sven Sandberg | 2011-05-26 | 2 | -0/+27 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | BUG#12574820: binlog.binlog_tmp_table timing out in daily and weekly trunk run | Sven Sandberg | 2011-05-26 | 2 | -0/+27 |
| | * | | | | | | | | | | Changed to Oracle bug numbers | Anitha Gopi | 2011-05-24 | 1 | -2/+2 |
| | * | | | | | | | | | | WL#5867 | Serge Kozlov | 2011-05-09 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Replaced all bug numbers with Oracle bugDB numbers | Anitha Gopi | 2011-05-23 | 1 | -2/+2 |
| * | | | | | | | | | | Bug#12346411 SQL/LOG.CC:6509: ASSERTION `PREPARED_XIDS > 0' FAILED | Jon Olav Hauglid | 2011-05-12 | 2 | -0/+43 |
| * | | | | | | | | | | auto-merge | Tatjana Azundris Nuernberg | 2011-05-12 | 7 | -1/+108 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | automerge 5.1->5.5 | Serge Kozlov | 2011-05-09 | 1 | -1/+1 |
| | * | | | | | | | | | | autocommit 5.1->5.5 | Serge Kozlov | 2011-04-26 | 2 | -8/+12 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | BUG#12371924. Fxi test case | Serge Kozlov | 2011-04-25 | 2 | -8/+12 |