Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MWL#234: @@skip_replication feature to MariaDB 5.5. | unknown | 2012-03-01 | 1 | -3/+16 |
|\ | |||||
| * | MWL#234: Implement option to switch between master-side and client-side filte... | unknown | 2011-08-16 | 1 | -3/+3 |
| * | MWL#234: After-review fixes, including better names for the new system variab... | unknown | 2011-08-12 | 1 | -7/+7 |
| * | MWL#234: Support for marking binlog events to not be replicated, and for tell... | unknown | 2011-08-11 | 1 | -3/+15 |
* | | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO"; | Michael Widenius | 2012-01-24 | 1 | -52/+28 |
* | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -0/+65 |
|\ \ | |||||
| * | | BUG#11760927 | Luis Soares | 2011-11-15 | 1 | -2/+2 |
| * | | BUG#11760927: 53375: RBR + NO PK => HIGH LOAD ON SLAVE (TABLE | Luis Soares | 2011-11-11 | 1 | -0/+64 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -18/+151 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -18/+151 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -18/+151 |
| | | |\ \ | |||||
* | | | | | | After-merge fixes for 5.5 merge. | unknown | 2011-12-14 | 1 | -3/+5 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -1/+2 |
* | | | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -2/+2 |
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -18/+150 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Automerge from mysql-5.1 into mysql-5.5. | Luis Soares | 2011-07-15 | 1 | -4/+11 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | DBUG_PRINT in solaris does not work well with NULL parameters. | Luis Soares | 2011-07-15 | 1 | -4/+11 |
| * | | | | | BUG#11753004 | Luis Soares | 2011-07-14 | 1 | -12/+136 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | BUG#11753004: 44360: REPLICATION FAILED | Luis Soares | 2011-07-14 | 1 | -12/+136 |
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -6/+27 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -145/+849 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -31/+46 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -3/+1 |
| | * | | | | | | | lp:705210 Compiling with BUILD/compile-pentium64-debug fails | Sergei Golubchik | 2011-03-26 | 1 | -4/+4 |
| | * | | | | | | | Fix compilation on Windows: | Vladislav Vaintroub | 2011-03-24 | 1 | -1/+2 |
| | * | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -28/+43 |
| * | | | | | | | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -1/+1 |
| * | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -5/+26 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -5/+26 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -5/+26 |
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | |||||
| * | | | | | | | | Fixed compiler warnings | Michael Widenius | 2011-05-08 | 1 | -7/+6 |
| * | | | | | | | | MWL#180: Merge bugfix from 5.2 to 5.3 codebase + really fix version from whic... | unknown | 2011-05-05 | 1 | -1/+1 |
| * | | | | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -79/+518 |
| * | | | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -15/+27 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -14/+26 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -14/+26 |
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | |||||
| | * | | | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| * | | | | | | | | | Fix incorrect DBUG_ASSERT(). | unknown | 2011-01-26 | 1 | -1/+1 |
| * | | | | | | | | | Fix two compiler warnings from Buildbot (including one bad merge). | unknown | 2011-01-11 | 1 | -1/+2 |
| * | | | | | | | | | Merge | unknown | 2011-01-10 | 1 | -23/+105 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Merge Percona patch row_based_replication_without_primary_key.patch into Mari... | unknown | 2010-12-27 | 1 | -23/+105 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -9/+155 |
| |/ / / / / / / / |