Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 2 | -5/+2 |
* | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -2/+14 |
* | Original idea from Zardosht Kasheff to add HA_CLUSTERED_INDEX | Michael Widenius | 2011-05-18 | 1 | -4/+7 |
* | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -3/+4 |
|\ | |||||
| * | Fix Windows embedded warnings | Vladislav Vaintroub | 2011-05-10 | 1 | -3/+4 |
* | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 58 | -878/+1235 |
|\ \ | |/ | |||||
| * | Automatic merge with 5.1 | Michael Widenius | 2011-05-04 | 1 | -1/+1 |
| |\ | |||||
| | * | Fixed compiler warning | Michael Widenius | 2011-05-04 | 1 | -1/+1 |
| * | | Automatic merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 4 | -6/+5 |
| |\ \ | | |/ | |||||
| | * | Automatic merge | Michael Widenius | 2011-05-03 | 2 | -4/+2 |
| | |\ | |||||
| | | * | Fixed after-merge failures found by buildbot | Michael Widenius | 2011-05-03 | 2 | -4/+2 |
| | * | | Fix Xtradb compile error on Win64 - conversion between pointers of different ... | Vladislav Vaintroub | 2011-05-03 | 1 | -1/+1 |
| | * | | Fix compile errors: | Vladislav Vaintroub | 2011-05-02 | 1 | -1/+2 |
| | |/ | |||||
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 58 | -875/+1233 |
| |\ \ | | |/ | |||||
| | * | Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1. | unknown | 2011-04-29 | 58 | -875/+1233 |
* | | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK" | Michael Widenius | 2011-04-28 | 4 | -8/+122 |
* | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 7 | -144/+251 |
|\ \ \ | |||||
| * | | | Change lock release to assert in XtraDB commit_ordered(); we never want to | unknown | 2011-04-07 | 3 | -43/+43 |
| * | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 62 | -760/+2365 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge MWL#116 after-review fixes. | unknown | 2011-03-31 | 3 | -2/+9 |
| |\ \ \ | |||||
| | * | | | MWL#116: After-review fixes. | unknown | 2011-03-31 | 3 | -2/+9 |
| * | | | | After-merge fixes for MWL#47 (which causes changes in binlog positions in .re... | unknown | 2011-01-27 | 1 | -1/+2 |
| * | | | | Merge three Percona patches into mariadb-5.2-rpl: | unknown | 2011-01-26 | 4 | -27/+11 |
| |\ \ \ \ | |||||
| * | | | | | Fix wrong printf() format. | unknown | 2011-01-26 | 1 | -1/+2 |
| * | | | | | Merge MWL#163 into mariadb-5.2-rpl | unknown | 2010-12-25 | 4 | -1/+82 |
| |\ \ \ \ \ | |||||
| | * | | | | | MWL#163: release of row locks in InnoDB during prepare | unknown | 2010-11-03 | 4 | -1/+82 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge MWL#116 into mariadb-5.2-rpl. | unknown | 2010-12-25 | 3 | -135/+153 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge latest MariaDB 5.1 into MWL#116. | unknown | 2010-11-01 | 46 | -293/+1053 |
| | |\ \ \ \ | |||||
| | * | | | | | MWL#116: Efficient group commit: Fix bug that binlog pos stored by XtraDB dur... | unknown | 2010-10-18 | 2 | -24/+12 |
| | * | | | | | MWL#116: Efficient group commit | unknown | 2010-10-04 | 2 | -67/+101 |
| | * | | | | | Merge with latest MariaDB 5.1 | unknown | 2010-10-01 | 250 | -2928/+42106 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | MWL#116: Efficient group commit for binary log | unknown | 2010-09-30 | 1 | -106/+102 |
* | | | | | | | | Make EXPLAIN better at displaying MRR/BKA: | Sergey Petrunya | 2011-04-02 | 2 | -0/+5 |
* | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 61 | -757/+2363 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 61 | -758/+2364 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Fixed compiler warnings | Michael Widenius | 2011-02-25 | 1 | -2/+2 |
| | * | | | | | | - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testing | Michael Widenius | 2011-02-25 | 3 | -2/+3 |
| | * | | | | | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed... | Michael Widenius | 2011-02-24 | 1 | -0/+2 |
| | * | | | | | | Fixed build failures | Michael Widenius | 2011-02-23 | 2 | -4/+5 |
| | * | | | | | | Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradb | Michael Widenius | 2011-02-22 | 27 | -404/+671 |
| | * | | | | | | Merge with xtradb code changes | Michael Widenius | 2011-02-22 | 48 | -427/+1762 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB. | unknown | 2011-02-04 | 48 | -427/+1762 |
| | * | | | | | | | Fixed compiler warnings | Michael Widenius | 2011-02-10 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| | * | | | | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -1/+1 |
* | | | | | | | | MRR interface: change range_info's type from char* to range_id_t typedef. The... | Sergey Petrunya | 2011-03-04 | 2 | -2/+2 |
* | | | | | | | | automatic merge | Michael Widenius | 2011-02-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed compiler warnings | Michael Widenius | 2011-02-25 | 1 | -1/+1 |
* | | | | | | | | | BUG#724537: innodb_mysql.test fails with --embedded-server | Sergey Petrunya | 2011-02-24 | 1 | -2/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Fixed build issues | Michael Widenius | 2011-02-23 | 1 | -1/+1 |
* | | | | | | | | Merge in new handler and handlersocket code into 5.3 main | Michael Widenius | 2011-02-22 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ |