Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 12 | -47/+119 |
|\ | |||||
| * | bug#bug11747416 post-push fixes to correct file name print out. | Andrei Elkin | 2011-09-30 | 4 | -4/+4 |
| * | Bug#11747416 : 32228 A disk full makes binary log corrupt | Andrei Elkin | 2011-09-29 | 4 | -3/+22 |
| * | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE... | Rohit Kalhans | 2011-09-29 | 4 | -43/+30 |
| * | merge mysql-5.5 (local) --> mysql-5.5 | Alfranio Correia | 2011-07-20 | 2 | -0/+16 |
| |\ | |||||
| | * | BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING ... | Alfranio Correia | 2011-07-18 | 2 | -0/+16 |
| * | | BUG#11753004 | Luis Soares | 2011-07-14 | 1 | -0/+49 |
| |\ \ | | |/ | |/| | |||||
| | * | BUG#11753004: 44360: REPLICATION FAILED | Luis Soares | 2011-07-14 | 1 | -0/+49 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 32 | -68/+910 |
|\ \ \ | |||||
| * \ \ | 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 | 5 | -5/+102 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |
| | * | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 5 | -5/+106 |
| * | | | | automerge | unknown | 2011-05-18 | 1 | -3/+5 |
| |\ \ \ \ | |||||
| | * | | | | merge some fixes for rpl_corruption.test from MySQL 5.6. | unknown | 2011-05-18 | 1 | -3/+5 |
| * | | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Automatic merge Mariadb 5.1->5.2. | unknown | 2011-05-09 | 1 | -0/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix buildbot failure in rpl_stop_slave.test. | unknown | 2011-05-09 | 1 | -0/+1 |
| * | | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge with main 5.3 | Michael Widenius | 2011-05-08 | 6 | -3/+307 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -0/+6 |
| * | | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 38 | -49/+173 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | / / / / / / | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 38 | -49/+173 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 38 | -49/+173 |
| | | |\ \ \ \ \ \ | |||||
| * | | \ \ \ \ \ \ | MWL#180: Merge bugfix from 5.2 to 5.3 codebase + really fix version from whic... | unknown | 2011-05-05 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | MWL#180: Fix bug where setting @@global.binlog_checksum did not actually chan... | unknown | 2011-05-05 | 1 | -0/+9 |
| * | | | | | | | | | MWL#180: merge fixes from 5.2-rpl + forgot to adjust revision from which chec... | unknown | 2011-05-04 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | MWL#180 Buildbot fixes: | unknown | 2011-05-04 | 1 | -6/+6 |
| * | | | | | | | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 6 | -3/+298 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 6 | -3/+298 |
| * | | | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 5 | -3/+407 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 254 | -2796/+2049 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge | unknown | 2011-01-10 | 1 | -0/+143 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Merge Percona patch row_based_replication_without_primary_key.patch into Mari... | unknown | 2010-12-27 | 1 | -0/+143 |
| | * | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 4 | -4/+274 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi... | Michael Widenius | 2011-03-23 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 251 | -2778/+2036 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 250 | -2772/+2021 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fixed some mysql-test-run failures and compile warnings/errors | Michael Widenius | 2011-01-20 | 6 | -0/+12 |
| * | | | | | | | | Merge with 5.1 | Michael Widenius | 2011-01-05 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Speed up `mtr --parallel=<lots>` by scheduling some slow tests earlier. | unknown | 2011-01-03 | 1 | -0/+4 |
| * | | | | | | | automatic merge with 5.1 | Michael Widenius | 2010-12-01 | 1 | -0/+29 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Bug#54201: "SET INSERT_ID" event must be ignored if corresponding event is ig... | unknown | 2010-11-30 | 1 | -0/+29 |
| * | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 7 | -14/+257 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 5 | -9/+252 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 2 | -5/+5 |
| | |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 16 | -33/+86 |
* | | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 289 | -3806/+2931 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | BUG#11746302 | Luis Soares | 2011-05-19 | 1 | -7/+4 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | |