Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 2 | -1/+12 |
* | merge. | Sergei Golubchik | 2010-11-25 | 15 | -483/+627 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 5 | -12/+32 |
| |\ | |||||
| | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 5 | -12/+32 |
| | |\ | |||||
| * | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -15/+15 |
| * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 4 | -64/+78 |
| |\ \ \ | | |/ / | |||||
| | * | | Automatic merge | Michael Widenius | 2010-09-06 | 2 | -2/+2 |
| | |\ \ | |||||
| | | * | | Fixed bug that 'maria_read_log -a' didn't set max_trid when reparing tables. | Michael Widenius | 2010-09-06 | 1 | -1/+1 |
| | | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -1/+1 |
| | | |\ \ | |||||
| | * | | | | make the check for windows | Sergei Golubchik | 2010-08-30 | 1 | -1/+1 |
| | * | | | | typo fixed | Sergei Golubchik | 2010-08-29 | 1 | -1/+1 |
| | * | | | | use the correct path separator on windows. | Sergei Golubchik | 2010-08-27 | 1 | -2/+5 |
| | |/ / / | |||||
| | * | | | mtr changes: | Sergei Golubchik | 2010-08-25 | 1 | -61/+72 |
| * | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 8 | -271/+155 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | allow suite.pm to tell mtr to skip the suite | Sergei Golubchik | 2010-08-24 | 1 | -0/+7 |
| | * | | | generalization of mtr to support suite.pm extensions: | Sergei Golubchik | 2010-08-17 | 8 | -273/+150 |
| * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 4 | -5/+72 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixes to allow one to compile and test innodb_plugin | Michael Widenius | 2010-08-04 | 1 | -1/+43 |
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 3 | -3/+28 |
| | |\ \ \ | |||||
| | * | | | | Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or... | Michael Widenius | 2010-07-30 | 1 | -1/+1 |
| * | | | | | merge | Sergei Golubchik | 2010-06-14 | 2 | -50/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | fixed for mysql-test-run to | Sergei Golubchik | 2010-06-10 | 2 | -49/+4 |
| * | | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 10 | -231/+188 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -82/+43 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 10 | -152/+148 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge Oqgraph with MariaDB 5.2 trunk | unknown | 2010-04-09 | 1 | -33/+14 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fixed race condition in safe_process.cc which may have caused some mysqltests... | Michael Widenius | 2010-04-08 | 1 | -33/+14 |
| * | | | | | | | automerge | unknown | 2010-03-30 | 4 | -11/+61 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Removed compiler warning | Michael Widenius | 2010-03-30 | 1 | -3/+41 |
| | * | | | | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 2 | -2/+2 |
| | * | | | | | | Fix some compiler warnings seen in Buildbot. | unknown | 2010-03-10 | 1 | -4/+10 |
| | * | | | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -2/+4 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Test skip due to missing OQGraph early, avoiding errors in log when starting ... | unknown | 2010-01-04 | 1 | -0/+11 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Fix for | Hakan Kuecuekyilmaz | 2009-12-09 | 1 | -0/+1 |
| * | | | | | | | | Fix some compiler warnings. | unknown | 2009-12-06 | 1 | -11/+1 |
| * | | | | | | | | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable... | Michael Widenius | 2009-12-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | Michael Widenius | 2009-11-11 | 8 | -66/+151 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | After-merge fixes following Merge of Mysql 5.1.41 into MariaDB: Fix path for ... | unknown | 2009-11-25 | 1 | -2/+1 |
| * | | | | | | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 8 | -65/+150 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge 5.1-release branch into MariaDB trunk. | unknown | 2009-11-06 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix running test suite from installed package. | unknown | 2009-11-05 | 1 | -0/+4 |
| * | | | | | | | | | | Automatic merge with 5.1-merge | Michael Widenius | 2009-10-14 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge. | unknown | 2009-10-08 | 1 | -0/+12 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt fil... | Sergey Petrunya | 2009-10-08 | 1 | -0/+12 |
| | * | | | | | | | | | | Fixes for package name change mysql -> mariadb. | unknown | 2009-10-08 | 2 | -1/+3 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | MBug#443014: Too many 'skipped' messages in mysql-test-run | unknown | 2009-10-05 | 1 | -0/+12 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge MySQL-5.1.38 and XtraDB-7 into MariaDB. | unknown | 2009-09-25 | 11 | -167/+336 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Apply the following MySQL's fix: | Sergey Petrunya | 2009-09-18 | 1 | -10/+20 |
| | * | | | | | | | | | MySQL 5.1.38 merge into MariaDB. | unknown | 2009-09-15 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ |