Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 13 | -129/+2352 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -0/+1 |
| |\ | |||||
| | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Bug#55846: Link tests fail on Windows - my_compiler.h missing | Davi Arnaut | 2010-08-24 | 1 | -0/+1 |
| * | | | make_win_bin_dist: include all dynamic plugins, not only innodb_plugin | Sergei Golubchik | 2010-09-16 | 1 | -14/+6 |
| * | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 2 | -4/+4 |
| * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 5 | -29/+32 |
| |\ \ \ | | |/ / | |||||
| | * | | Updated failure text for maria_install_db | Michael Widenius | 2010-09-09 | 1 | -8/+4 |
| | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 4 | -21/+28 |
| | |\ \ | | | |/ | |||||
| * | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 2 | -2/+30 |
| |\ \ \ | | |/ / | |||||
| | * | | Trivial fixes, more safe DBUG_ASSERT()'s and some more DBUG_ | Michael Widenius | 2010-08-23 | 1 | -1/+1 |
| | * | | Added verbose mode to recovery | Michael Widenius | 2010-08-18 | 2 | -2/+30 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 2 | -4/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed compiler warnings | Michael Widenius | 2010-08-04 | 1 | -1/+1 |
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -3/+5 |
| | |\ \ | |||||
| * | | | | fixes for buildbot | Sergei Golubchik | 2010-07-25 | 1 | -2/+2 |
| * | | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+9 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix a loop and install more script files. Renames the perlscripts component t... | Bo Thorsen | 2010-06-28 | 1 | -1/+5 |
| | * | | | Implement an NSIS based installer | Bo Thorsen | 2010-06-25 | 1 | -0/+5 |
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 6 | -69/+106 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 2 | -1/+14 |
| | |\ \ \ | |||||
| | * \ \ \ | Automerge latest MariaDB 5.1 trunk into 5.1.46 release. | unknown | 2010-05-15 | 1 | -7/+7 |
| | |\ \ \ \ | |||||
| | * | | | | | Fixes after last merge of MySQL 5.1 | Michael Widenius | 2010-05-13 | 1 | -1/+1 |
| | * | | | | | Merge to get PBXT's xstat program | Michael Widenius | 2010-05-12 | 2 | -0/+7 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merged MySQL 5.1.46 GPLed documentation into MariaDB. | unknown | 2010-04-28 | 1 | -66/+66 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Imported MySQL documentation files from ../mysql-5.1.46 | unknown | 2010-04-28 | 1 | -66/+66 |
| | * | | | | | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 2 | -3/+19 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | merged | Sergei Golubchik | 2010-05-15 | 2 | -8/+7 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | Build perl scripts in the correct directory | Bo Thorsen | 2010-05-12 | 1 | -7/+7 |
| | * | | | | | | | Removed extra } that caused script to fail with syntax error | Michael Widenius | 2010-05-10 | 1 | -1/+0 |
| | |/ / / / / / | |||||
| * | | | | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 2 | -5/+5 |
| * | | | | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 3 | -4/+7 |
| |/ / / / / / | |||||
| * | | | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 2 | -0/+33 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 3 | -85/+144 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix test suite so that it works when doing configure --without-uca | Michael Widenius | 2009-12-27 | 1 | -1/+1 |
| * | | | | | | | | Merge free documentation from MySQL 5.1.41 source tarball into MariaDB. | unknown | 2009-12-01 | 1 | -15/+17 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | Imported MySQL documentation files from MySQL 5.1.41 source tarball | unknown | 2009-12-01 | 1 | -15/+17 |
| * | | | | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 3 | -1/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge with 5.1-release | Michael Widenius | 2009-10-30 | 1 | -8/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Added symbolic link to from scripts/mysql_install_db to bin to address a docu... | Michael Widenius | 2009-10-26 | 1 | -8/+10 |
| * | | | | | | | | | | Compile by default MySQL clients with libmysqldclient.a (not .so) | Michael Widenius | 2009-10-29 | 1 | -0/+12 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Fixes for binary distribution in tar file | Michael Widenius | 2009-10-23 | 2 | -23/+194 |
| * | | | | | | | | | Updated make_binary_distribution for MariaDB | Michael Widenius | 2009-10-21 | 1 | -2/+5 |
| * | | | | | | | | | Fix make_win_bin_dist: | Sergey Petrunya | 2009-10-09 | 1 | -3/+21 |
| * | | | | | | | | | Merge free documentation from MySQL 5.1.38 source release tarball. | unknown | 2009-09-16 | 1 | -1068/+1071 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Imported MySQL documentation files from /home/knielsen/devel/maria/mysql-5.1.38 | unknown | 2009-09-16 | 1 | -1068/+1071 |
| * | | | | | | | | | MySQL 5.1.38 merge into MariaDB. | unknown | 2009-09-15 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 12 | -98/+193 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 1 | -24/+32 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Imported freely distributable documentation from upstream MySQL 5.1.34 source... | unknown | 2009-05-25 | 1 | -3/+2010 |