Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -9/+10 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-04-14 | 1 | -4/+5 |
| |\ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2013-04-12 | 1 | -4/+5 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-04-11 | 1 | -4/+5 |
| | | |\ | |||||
| | | | * | 5.1 merge | Sergei Golubchik | 2013-04-11 | 1 | -4/+5 |
| | | | |\ | |||||
| | | | | * | MDEV-4244 [PATCH] Buffer overruns and use-after-free errors | Sergei Golubchik | 2013-04-06 | 1 | -4/+5 |
| * | | | | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -5/+5 |
| |/ / / / | |||||
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -72/+108 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.3 merge | Sergei Golubchik | 2013-01-25 | 1 | -72/+108 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.2 merge | Sergei Golubchik | 2013-01-25 | 1 | -72/+108 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-3915 COM_CHANGE_USER allows fast password brute-forcing | Sergei Golubchik | 2013-01-25 | 1 | -72/+108 |
| | | |/ | |||||
| | * | | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -1363/+6 |
| | |\ \ | | | |/ | |||||
| | | * | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -1361/+6 |
| | | |\ | |||||
* | | | \ | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | typo | Sergei Golubchik | 2012-12-06 | 1 | -1/+1 |
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -0/+17 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix yet another regression after MDEV-3885. | Vladislav Vaintroub | 2012-11-27 | 1 | -1/+1 |
| * | | | | MDEV-3885 - connection suicide via mysql_kill() causes assertion in server | Vladislav Vaintroub | 2012-11-27 | 1 | -0/+17 |
* | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -3/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -3/+6 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge from 5.1 to 5.5 | Praveenkumar Hulakund | 2012-07-26 | 1 | -2/+5 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
* | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -1679/+83 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 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 | 1 | -1423/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Refactor mysql_client_test.c into a framework part and a test part | Bjorn Munch | 2012-07-09 | 1 | -1396/+5 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Refactor mysql_client_test.c into a framework part and a test part | Bjorn Munch | 2012-07-09 | 1 | -1353/+5 |
* | | | | | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 1 | -7/+9 |
* | | | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -39/+263 |
|/ / / / / | |||||
* | | | | | 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 |
| |\ \ \ \ \ \ |