Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |\ | |||||
| | | * | DBUG_PRINT in solaris does not work well with NULL parameters. | Luis Soares | 2011-07-15 | 1 | -4/+11 |
| | | * | 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-06-30 | 1 | -2/+4 |
| | | |\ \ | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -1/+2 |
* | | | | | | 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 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | BUG#11766865: 60091: RBR + NO PK + UPDATE NULL VALUE --> SLAVE BREAK WITH ERR... | Luis Soares | 2011-03-24 | 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 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Bug #50914 mysqlbinlog not handling drop of current default database | unknown | 2010-12-29 | 1 | -1/+6 |
| | | * | | | Bug #56662 Assertion failed: next_insert_id == 0, file .\handler.cc | unknown | 2010-12-21 | 1 | -12/+18 |
| | | * | | | BUG 46697 | Luis Soares | 2010-12-14 | 1 | -1/+1 |
| | | * | | | BUG#46697: Table name in error message is not populated | Luis Soares | 2010-12-03 | 1 | -1/+2 |
| | | |/ / | |||||
| * | | | | 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 |
|/ / / / / | |||||
* | | | | | automatic merge with 5.1 | Michael Widenius | 2010-12-01 | 1 | -0/+13 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Bug#54201: "SET INSERT_ID" event must be ignored if corresponding event is ig... | unknown | 2010-11-30 | 1 | -0/+13 |
* | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -25/+34 |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | |||||
| * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -25/+34 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#27606 GRANT statement should be replicated with DEFINER information | unknown | 2010-10-23 | 1 | -1/+1 |
| | * | | Bug#55478 Row events wrongly apply on the temporary table of the same name | unknown | 2010-10-21 | 1 | -0/+1 |
| | * | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-19 | 1 | -1/+1 |
| | * | | BUG 38718: automerged bzr bundle from bug report into | Luis Soares | 2010-10-13 | 1 | -4/+10 |
| | |\ \ | |||||
| | | * | | BUG#38718: slave sql thread crashes when reading relay log | Luis Soares | 2010-10-06 | 1 | -4/+10 |
| | * | | | Bug#55375 Transaction bigger than max_binlog_cache_size crashes slave | unknown | 2010-10-09 | 1 | -19/+21 |
| | |/ / | |||||
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -17/+91 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -1/+1 |
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -16/+90 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -17/+15 |