| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 20 | -15/+186 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 20 | -15/+187 |
| | |\ | |||||
| | | * | Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTED | Nirbhay Choubey | 2011-09-06 | 1 | -0/+5 |
| | | * | Removing a stray line, went into the last push. | Nirbhay Choubey | 2011-09-06 | 1 | -1/+0 |
| | | * | Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTED | Nirbhay Choubey | 2011-09-06 | 1 | -0/+6 |
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+2 |
| | | |\ | |||||
| | | | * | merge mysql-5.0-security->mysql-5.1-security | Georgi Kodinov | 2011-03-21 | 1 | -0/+1 |
| | | | |\ | |||||
| | | | | * | Bug #59815: Missing License information with enterprise GPL packages | Georgi Kodinov | 2011-02-08 | 1 | -0/+1 |
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 18 | -38/+50 |
| | | |\ \ \ | | | |/ / | | |/| | | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 13 | -30/+43 |
| | | | |/ | |||||
| | * | | | Ensure that the last --datadir option is used from the my.cnf files. | Michael Widenius | 2011-07-24 | 1 | -4/+1 |
| * | | | | Merge with base 5.2 | Michael Widenius | 2011-03-23 | 7 | -47/+86 |
| |\ \ \ \ | |||||
| | * | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi... | Michael Widenius | 2011-03-23 | 2 | -16/+38 |
| | * | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 7 | -31/+48 |
| * | | | | | fix warning | Vladislav Vaintroub | 2011-03-11 | 1 | -1/+1 |
| * | | | | | remove unused variable | Vladislav Vaintroub | 2011-03-11 | 1 | -1/+0 |
| * | | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -5/+2 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -5/+2 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -5/+2 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Merge | Kent Boortz | 2010-12-29 | 13 | -2/+183 |
| | | | |\ \ | | | | |/ | |||||
| | | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 16 | -4/+216 |
| | | | * | | Merge from mysql-5.0-bugteam. | Alexander Nozdrin | 2010-11-24 | 2 | -5/+5 |
| | | | |\ \ | | | | |/ | |||||
| | | | | * | A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remov... | Alexander Nozdrin | 2010-11-24 | 3 | -5/+5 |
| * | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 3 | -56/+100 |
| |/ / / / | |||||
| * | | | | merge with 5.1 | Michael Widenius | 2011-01-07 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Don't do DBUG_ASSERT for checksum errors when using REPAIR | Michael Widenius | 2011-01-07 | 1 | -1/+1 |
| * | | | | Merge with 5.1 | Michael Widenius | 2010-12-04 | 1 | -2/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings | Vladislav Vaintroub | 2010-12-01 | 1 | -4/+2 |
| * | | | | 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 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Bug #54004 : mysql_secure_installation identifies "local host" incorrectly | Georgi Kodinov | 2010-07-14 | 2 | -2/+2 |
| | | * | | Bug #52274 : Missing path to mysql in mysql_secure_installation | Georgi Kodinov | 2010-07-09 | 1 | -1/+19 |
| | | * | | Bug #53613: mysql_upgrade incorrectly revokes TRIGGER privilege on given table | Georgi Kodinov | 2010-07-01 | 1 | -3/+1 |
| * | | | | 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 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Bug#54590 "make_binary_distribution" fails because a command | Joerg Bruehe | 2010-06-17 | 1 | -3/+5 |
| | | |\ \ | | | |/ | |||||
| | | | * | Bug#54590 "make_binary_distribution" fails because a command | Joerg Bruehe | 2010-06-17 | 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 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |