| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -8/+4 |
| |\ | |||||
| | * | fixes for get_password(): | Sergei Golubchik | 2012-01-12 | 1 | -8/+4 |
| * | | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 2 | -16/+16 |
| |\ \ | |/ | |||||
| | * | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 2 | -16/+16 |
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 5 | -11/+13 |
| |\ \ | |/ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 5 | -11/+13 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 5 | -11/+13 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 2 | -4/+4 |
| | | | |\ | |||||
| | | | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 4 | -10/+12 |
| | | | |\ \ | |||||
| | | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -7/+10 |
| * | | | | | | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -0/+1 |
| | |/ / / / / | |||||
| * | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -1/+2 |
| * | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |
| | * | | | | | | post-review changes 1 | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |
| | * | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -2/+2 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -6/+4 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | Small CMake fixes : | Vladislav Vaintroub | 2011-05-15 | 1 | -6/+4 |
| * | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 3 | -4/+6 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Fixed bug when accessing wrong decimal value in dynamic string (Fixed lp:781233) | Michael Widenius | 2011-05-12 | 1 | -1/+1 |
| | * | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 3 | -3/+5 |
| * | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 2 | -2/+2 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 2 | -2/+2 |
| | | |/ / | |||||
| * | | | | CMake/code signing: | Vladislav Vaintroub | 2011-03-28 | 1 | -5/+2 |
| * | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 3 | -2/+11 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 3 | -2/+11 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed... | Michael Widenius | 2011-02-24 | 1 | -0/+8 |
| | | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -4/+6 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Merge from mysql-5.0-bugteam. | Alexander Nozdrin | 2010-11-24 | 8 | -16/+8 |
| | | | |\ \ | | | | |/ | |||||
| | | | | * | A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remov... | Alexander Nozdrin | 2010-11-24 | 8 | -16/+8 |
| | | | * | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 1 | -2/+2 |
| | | * | | | Merge with 5.1 | Michael Widenius | 2011-01-30 | 2 | -1/+2 |
| * | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -10/+4 |
| |/ / / / | |||||
| * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
| * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 2 | -5/+4 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -3/+0 |
| | * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -2/+4 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Fixed bug #47485 - mysql_store_result returns a not NULL result set | Dmitry Shulga | 2010-09-07 | 1 | -2/+4 |
| * | | | | 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 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |