| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | | * | | | | | | Fixed build errors on centos5-amd64-minimal, where we compile with very few c... | Michael Widenius | 2011-05-04 | 1 | -1/+2 |
| | * | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+118 |
| | |\ \ \ \ \ \ \
| | | |/ / / / / / |
|
| | | * | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+118 |
| | | |\ \ \ \ \ \
| | | | | |_|_|_|/
| | | | |/| | | | |
|
| * | | | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -0/+107 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | | |
|
| | * | | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 2 | -5/+5 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge MWL#116, PBXT part into mariadb-5.2-rpl | unknown | 2011-01-31 | 1 | -0/+107 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | MWL#116: Efficient group commit: PBXT part | unknown | 2010-10-15 | 1 | -0/+107 |
| * | | | | | | | | | | Merge with base 5.2 | Michael Widenius | 2011-03-23 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 2 | -2/+4 |
| | | |_|/ / / / / / /
| | |/| | | | | | | | |
|
| * | | | | | | | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / |
|
| | * | | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 2 | -5/+5 |
| | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | / / / / / /
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 2 | -5/+5 |
| | | |\ \ \ \ \ \ \
| | | | | |_|_|_|/ /
| | | | |/| | | | | |
|
| * | | | | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -1/+1 |
| |/ / / / / / / / |
|
| * | | | | | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | * | | | | | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -1/+0 |
| * | | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -0/+102 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | * | | | | | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -0/+102 |
| | |\ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | | |
|
* | | | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -12/+12 |
* | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 18 | -95/+784 |
|\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ /
| |/| | | | | | | |
|
| * | | | | | | | | Bug#12337762 : MYSQL_LIST_FIELDS() RETURNS WRONG CHARSET FOR CHAR/VARCHAR/TEXT | Mayank Prasad | 2011-06-10 | 1 | -18/+94 |
| * | | | | | | | | Fixed cast warnings in introducing the pluggable authentication client | Georgi Kodinov | 2011-06-06 | 1 | -2/+2 |
| * | | | | | | | | A patch for Bug#11763413 (56115: SELECT doesn't work in | Alexander Nozdrin | 2011-03-22 | 1 | -3/+6 |
| * | | | | | | | | Bug #11766854: 60075: MYSQL_LOAD_CLIENT_PLUGIN DOESN'T CLEAR ERROR | Georgi Kodinov | 2011-03-17 | 1 | -0/+41 |
| * | | | | | | | | Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial | Dmitry Shulga | 2011-03-15 | 1 | -0/+51 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| | * | | | | | | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". | Dmitry Shulga | 2011-03-15 | 1 | -0/+51 |
| * | | | | | | | | Merging from 5.1 | Alexander Barkov | 2011-02-18 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | * | | | | | | | A post-fix for b58036. | Alexander Barkov | 2011-02-18 | 1 | -3/+3 |
| | * | | | | | | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they... | Alexander Barkov | 2011-02-18 | 1 | -0/+67 |
| | | |_|_|/ / /
| | |/| | | | | |
|
| * | | | | | | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they... | Alexander Barkov | 2011-02-18 | 1 | -0/+67 |
| * | | | | | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -10/+0 |
| * | | | | | | | Merge | Kent Boortz | 2010-12-29 | 16 | -2/+235 |
| |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | * | | | | | | Merge | Kent Boortz | 2010-12-29 | 17 | -4/+237 |
| | |\ \ \ \ \ \
| | | | |_|_|_|/
| | | |/| | | | |
|
| | | * | | | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 17 | -4/+237 |
| | * | | | | | | Assorted post-merge fixes, clean-up, integration, compat with 5.6. | Tatiana A. Nurnberg | 2010-11-25 | 1 | -2/+2 |
| | | |_|_|_|/
| | |/| | | | |
|
| * | | | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 1 | -62/+0 |
| * | | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtime | Jon Olav Hauglid | 2010-11-17 | 1 | -3/+3 |
| |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-11-16 | 1 | -3/+3 |
| | |\ \ \ \ \ \
| | | |/ / / / / |
|
| | | * | | | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 1 | -3/+3 |
| | | | |_|_|/
| | | |/| | | |
|
| * | | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtime | Jon Olav Hauglid | 2010-11-16 | 1 | -0/+250 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Fix for Bug#56934 (mysql_stmt_fetch() incorrectly fills MYSQL_TIME | Alexander Nozdrin | 2010-11-13 | 1 | -0/+250 |
| * | | | | | | Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW over | Konstantin Osipov | 2010-11-12 | 1 | -1/+41 |
| |/ / / / / |
|
| * | | | | | merge | Georgi Kodinov | 2010-10-04 | 1 | -0/+102 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | merge of mysql-5.5 into mysql-5.5-wl1054 | Georgi Kodinov | 2010-09-20 | 1 | -10/+39 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | merged mysql-5.5 into WL1054-5.5 | Georgi Kodinov | 2010-08-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -0/+1 |
* | | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 2 | -173/+217 |
|\ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / /
|/| | | | | | / /
| | |_|_|_|_|/ /
| |/| | | | | | |
|
| * | | | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -18/+44 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | * | | | | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -18/+44 |
| | |\ \ \ \ \ \ |
|
| * | \ \ \ \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2010-08-06 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | * | | | | | | | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar... | Michael Widenius | 2010-08-06 | 1 | -6/+6 |