| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -3/+1 |
| |\ | |||||
| | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -3/+1 |
| | |\ | |||||
| | | * | Fix what is probably the result of a bad merge. No functional change. | Davi Arnaut | 2010-07-06 | 1 | -0/+1 |
| | | * | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 2 | -2/+1 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -5/+25 |
| |\ \ \ | |/ / | |||||
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -5/+25 |
| | |\ \ | | |/ | |||||
| | | * | Automerge. | Alexey Kopytov | 2010-07-01 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Bug#54667: Unnecessary signal handler redefinition | Alexey Kopytov | 2010-07-01 | 1 | -1/+1 |
| | | * | | Bug #53899 Wrong mysql_stmt_errno() after connection loss with | Staale Smedseng | 2010-06-30 | 1 | -4/+24 |
| | | |/ | |||||
| * | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+8 |
| |\ \ \ | |/ / | |||||
| | * | | Implement an NSIS based installer | Bo Thorsen | 2010-06-25 | 1 | -0/+8 |
| * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -0/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+1 |
| | |\ \ | | |/ | |||||
| | | * | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2010-02-26 | 1 | -0/+1 |
| * | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 5 | -91/+37 |
| |/ / | |||||
| * | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -4/+6 |
| |\ \ | |/ | |||||
| | * | Manual merge. | Davi Arnaut | 2009-12-18 | 1 | -2/+5 |
| | |\ | |||||
| | | * | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 1 | -2/+5 |
| | * | | Merge approved bug fix | Jim Winstead | 2009-12-16 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | Fix C99 aliasing violation due to mismatched types that were papered over | Jim Winstead | 2009-11-23 | 1 | -2/+2 |
| | * | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 1 | -1/+0 |
| * | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 2 | -15/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an... | Davi Arnaut | 2009-11-24 | 2 | -15/+0 |
| | |/ / | |||||
| * | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 2 | -0/+15 |
| |\ \ \ | |||||
| | * \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 2 | -0/+15 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Automerge. | Davi Arnaut | 2009-11-03 | 1 | -6/+8 |
| | | |\ \ | | | |/ | |||||
| | | | * | Fix compiler warnings -- tag unused parameters. | Davi Arnaut | 2009-11-03 | 1 | -6/+8 |
| | | * | | Automerge. | Davi Arnaut | 2009-11-02 | 2 | -0/+13 |
| | | |\ \ | | | |/ | |||||
| | | | * | Bug#41728: Dropped symbol but no soname change | Davi Arnaut | 2009-09-29 | 2 | -0/+13 |
| * | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -2/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -2/+1 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -2/+1 |
| | | |\ \ | | | |/ | |||||
| | | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -2/+1 |
| * | | | | Fixes for binary distribution in tar file | Michael Widenius | 2009-10-23 | 1 | -1/+2 |
| |/ / / | |||||
| * | | | Fix a problem in windows build introduced a few csets ago (in | Sergey Petrunya | 2009-10-05 | 1 | -0/+1 |
| * | | | Added client functions: | Michael Widenius | 2009-10-02 | 1 | -0/+12 |
| * | | | Fix windows build: add strmov_overlapp.c to CMakeLists.txt | Sergey Petrunya | 2009-09-10 | 1 | -1/+1 |
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 2 | -3/+3 |
| |\ \ \ | |/ / | |||||
| | * | | Auto-merge | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
| | | * | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails. | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
| | | * | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -2/+2 |
| | | |\ | |||||
| | * | | | Bug #43397 mysql headers redefine pthread_mutex_init | Staale Smedseng | 2009-07-08 | 1 | -2/+2 |
| * | | | | Cherry-pick revid:psergey@askmonty.org-20090608135546-ut1yrzbah4gdw6e6 | unknown | 2009-06-15 | 1 | -1/+2 |
| * | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -3/+3 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -3/+3 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 2 | -5/+5 |
| * | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |