| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 1 | -0/+18 |
|\ |
|
| * | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 1 | -0/+2 |
| * | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 1 | -0/+16 |
* | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -3/+1 |
|\ \ |
|
| * \ | Auto-merge from mysql-5.1-security. | Alexander Nozdrin | 2011-10-20 | 1 | -3/+3 |
| |\ \ |
|
| * \ \ | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-10-12 | 1 | -3/+7 |
| |\ \ \ |
|
| * \ \ \ | Manual merge from mysql-5.1-security. | Alexander Nozdrin | 2011-09-23 | 1 | -0/+81 |
| |\ \ \ \ |
|
* | \ \ \ \ | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+85 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -1/+85 |
| |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -1/+82 |
| | |\ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | | * | | | | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -0/+80 |
| | | |\ \ \ \ \
| | | | | |_|_|/
| | | | |/| | | |
|
| | | | * | | | | Fix Windows-build failure: use my_snprintf() instead of snprintf(). | Alexander Nozdrin | 2011-10-20 | 1 | -3/+3 |
| | | | | |/ /
| | | | |/| | |
|
| | | | * | | | Fix for Bug#13001491: MYSQL_REFRESH CRASHES WHEN STORED ROUTINES ARE RUN CONC... | Alexander Nozdrin | 2011-09-22 | 1 | -0/+80 |
| | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+2 |
| | | |\ \ \ \
| | | | |/ / / |
|
| | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+119 |
| | | | |\ \ \ |
|
* | | | | \ \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -8/+37 |
|\ \ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | | |
|
| * | | | | | | | Bug#12912112 MYSQL_CLIENT_TEST FAILS ON TEST_TRUNCATION | Magne Mahre | 2011-10-06 | 1 | -3/+7 |
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | backport from mysql-trunk | Gleb Shchepa | 2011-08-03 | 1 | -0/+29 |
| * | | | | | | Bug#12727287: Maintainer mode compilation fails with gcc 4.6 | Davi Arnaut | 2011-07-07 | 1 | -5/+1 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -7/+76 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -1/+67 |
| * | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -2/+2 |
| * | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -12/+12 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | / / / /
| | |_|/ / / /
| |/| | | | | |
|
| | * | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -12/+12 |
| * | | | | | | Automatic merge with 5.1 | Michael Widenius | 2011-05-04 | 1 | -1/+2 |
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | * | | | | | 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 |
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| * | | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+2 |
| * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -3/+3 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -3/+3 |
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| * | | | | | | 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 | 1 | -22/+550 |
|\ \ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | | |
|
| * | | | | | | | 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 |
| * | | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | |\ \ \ \ \ |
|
| | | * | | | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
| | * | | | | | | Assorted post-merge fixes, clean-up, integration, compat with 5.6. | Tatiana A. Nurnberg | 2010-11-25 | 1 | -2/+2 |
| | | |_|_|_|/
| | |/| | | | |
|