Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -5/+15 |
|\ | |||||
| * | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -5/+15 |
| |\ | |||||
| | * | upmerge from mysql-5.1=>mysql-5.5 | Rohit Kalhans | 2012-08-08 | 1 | -1/+12 |
| | |\ | |||||
| | | * | BUG#11757312: MYSQLBINLOG DOES NOT ACCEPT INPUT FROM STDIN | Rohit Kalhans | 2012-08-08 | 1 | -1/+12 |
| | * | | Merge of patch for Bug#13928675 from mysql-5.1. | Nirbhay Choubey | 2012-08-07 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -1/+1 |
* | | | | MDEV-225: Replace with dummy events an event that is not understood by a slav... | unknown | 2012-06-22 | 1 | -0/+13 |
* | | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 1 | -6/+34 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge from 5.3 | unknown | 2012-08-24 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | merge from 5.2 | unknown | 2012-08-24 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Merge from 5.1. | unknown | 2012-08-24 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| * | | \ \ \ | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -4/+33 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | merge from 5.1 to 5.5 | Sujatha Sivakumar | 2012-07-10 | 1 | -1/+12 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | BUG#11762670:MY_B_WRITE RETURN VALUE IGNORED | Sujatha Sivakumar | 2012-07-10 | 1 | -1/+12 |
| | * | | | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING) | Jon Olav Hauglid | 2012-06-29 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING) | Jon Olav Hauglid | 2012-06-29 | 1 | -2/+2 |
| | * | | | | | upmerge from mysql-5.1 branch -> mysql-5.5 branch | Rohit Kalhans | 2012-05-29 | 1 | -1/+20 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Bug#11762667: MYSQLBINLOG IGNORES ERRORS WHILE WRITING OUTPUT | Rohit Kalhans | 2012-05-29 | 1 | -1/+20 |
* | | | | | | | Increased the version number to 10.0 | Michael Widenius | 2012-05-31 | 1 | -7/+9 |
|/ / / / / / | |||||
* | | | | | | Merge MWL#234: @@skip_replication feature to MariaDB 5.5. | unknown | 2012-03-01 | 1 | -0/+33 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MWL#234: After-review fixes, including better names for the new system variab... | unknown | 2011-08-12 | 1 | -16/+11 |
| * | | | | | | MWL#234: Support for marking binlog events to not be replicated, and for tell... | unknown | 2011-08-11 | 1 | -0/+38 |
* | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+5 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+6 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+6 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+6 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
* | | | | | | move safemalloc out of dbug. | Sergei Golubchik | 2011-12-12 | 1 | -11/+15 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -6/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -6/+6 |
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+5 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | BUG#12695969 | Luis Soares | 2011-07-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | BUG#12695969 | Luis Soares | 2011-07-11 | 1 | -4/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTION | Luis Soares | 2011-07-11 | 1 | -7/+3 |
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -5/+14 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -28/+177 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -1/+1 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -1/+1 |
| * | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -2/+2 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -3/+11 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -3/+11 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -3/+11 |
| | | |\ \ \ \ \ | |||||
| * | | \ \ \ \ \ | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 1 | -7/+27 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -7/+27 |
| * | | | | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -13/+136 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | | |