Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -33/+6 |
|\ | |||||
| * | rename binlog_dbug_fsync_sleep -> debug_binlog_fsync_sleep | Sergei Golubchik | 2011-11-03 | 1 | -18/+1 |
| * | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 1 | -11/+0 |
| * | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -4/+4 |
| * | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -1/+2 |
| |\ | |||||
| | * | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -1/+2 |
* | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -8/+9 |
|\ \ \ | |||||
| * | | | Some after-merge fixes for 5.5 merge. | unknown | 2011-10-25 | 1 | -2/+3 |
| * | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -6/+6 |
* | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -16/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
* | | | | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -1/+1 |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -311/+1284 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -2/+2 |
| * | | | | automatic merge with 5.2 | Michael Widenius | 2011-05-28 | 1 | -2/+16 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fix line endings. | Vladislav Vaintroub | 2011-05-26 | 1 | -4/+4 |
| | * | | | Fixed sql_perror() to return appropriate error messages on Windows, | Vladislav Vaintroub | 2011-05-26 | 1 | -2/+16 |
| | * | | | Automatic merge with 5.1 | Michael Widenius | 2011-05-04 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | Fixed build errors on centos5-amd64-minimal, where we compile with very few c... | Michael Widenius | 2011-05-04 | 1 | -0/+1 |
| * | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -61/+48 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | microseconds in log tables: | Sergei Golubchik | 2011-05-19 | 1 | -60/+47 |
| | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -6/+6 |
| * | | | | | Fixed compiler warnings | Michael Widenius | 2011-05-08 | 1 | -3/+3 |
| * | | | | | MWL#180: Merge bugfix from 5.2 to 5.3 codebase + really fix version from whic... | unknown | 2011-05-05 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | MWL#180: Fix bug where setting @@global.binlog_checksum did not actually chan... | unknown | 2011-05-05 | 1 | -1/+1 |
| * | | | | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 1 | -25/+245 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -25/+245 |
| * | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -274/+1004 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fix merge error. | unknown | 2011-04-07 | 1 | -4/+0 |
| | * | | | | | Merge --binlog_optimize_thread_scheduling into mariadb-5.2-rpl. | unknown | 2011-04-04 | 1 | -6/+65 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | MWL#116: group commit | unknown | 2011-03-23 | 1 | -6/+62 |
| | * | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -117/+192 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge MWL#136 after-review fixes into mariadb-5.2-rpl | unknown | 2011-04-01 | 1 | -6/+20 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | MWL#136 after-review fixes. | unknown | 2011-04-01 | 1 | -6/+20 |
| | * | | | | | | | | Merge MWL#116 after-review fixes. | unknown | 2011-03-31 | 1 | -105/+93 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | MWL#116: After-review fixes. | unknown | 2011-03-31 | 1 | -105/+88 |
| | | | |_|/ / / / / | | | |/| | | | | | | |||||
| | * | | | | | | | | Merge fix for lp:697174 | unknown | 2011-01-27 | 1 | -6/+18 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | lp:697174: Do not put absolute path in status variable binlog_snapshot_file. | unknown | 2011-01-27 | 1 | -6/+18 |
| | * | | | | | | | | automerge | unknown | 2011-01-27 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | MWL#136: Fix typo (wrong type) breaking compile. | unknown | 2011-01-27 | 1 | -1/+1 |
| | * | | | | | | | | Merge three Percona patches into mariadb-5.2-rpl: | unknown | 2011-01-26 | 1 | -5/+19 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -5/+19 |
| | * | | | | | | | | | Merge MWL#163 into mariadb-5.2-rpl | unknown | 2010-12-25 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | MWL#163: release of row locks in InnoDB during prepare | unknown | 2010-11-03 | 1 | -0/+3 |
| | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge MWL#136 into mariadb-5.2-rpl | unknown | 2010-12-25 | 1 | -20/+86 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | MWL#136: Rename binlog_trx_{file,position} to the much better binlog_snapshot... | unknown | 2010-11-08 | 1 | -11/+12 |
| | | * | | | | | | | | MWL#136: Cross-engine consistency for START TRANSACTION WITH CONSISTENT SNAPSHOT | unknown | 2010-11-07 | 1 | -20/+85 |
| | | |/ / / / / / / | |||||
| | * | | | | | | | | Merge MWL#116 into mariadb-5.2-rpl. | unknown | 2010-12-25 | 1 | -225/+780 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | / / / / / / | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | Fix error insert to have deterministic errno (fixes test failure on mac). | unknown | 2010-11-02 | 1 | -1/+2 |