Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix for bug lp:1039277 "Crash in sql_cache.cc". | Michael Widenius | 2012-08-21 | 1 | -0/+47 |
* | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 2 | -1423/+1446 |
|\ | |||||
| * | Fixed compile error in mysql_client_test using gcc | Bjorn Munch | 2012-07-09 | 1 | -1/+1 |
| |\ | |||||
| | * | Fixed compile error in mysql_client_test using gcc | Bjorn Munch | 2012-07-09 | 1 | -1/+1 |
| * | | Refactor mysql_client_test.c into a framework part and a test part | Bjorn Munch | 2012-07-09 | 2 | -1396/+1423 |
| |\ \ | | |/ | |||||
| | * | Refactor mysql_client_test.c into a framework part and a test part | Bjorn Munch | 2012-07-09 | 3 | -1353/+1381 |
* | | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 5 | -0/+1049 |
|\ \ \ | |||||
| * | | | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 3 | -26/+29 |
| * | | | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 5 | -0/+1046 |
* | | | | 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 | 4 | -6/+110 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 4 | -6/+107 |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | 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 | 4 | -6/+27 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+119 |
| | | | |\ \ \ | |||||
* | | | | \ \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 5 | -16/+47 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | 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 |
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 4 | -8/+10 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -7/+12 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -5/+7 |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 3 | -8/+185 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | 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 |
| * | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | Small CMake fixes : | Vladislav Vaintroub | 2011-05-15 | 1 | -2/+2 |
| * | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+119 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | 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 |
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | |||||
| * | | | | | | | | 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 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | | |