Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -12/+32 |
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -35/+35 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -32/+32 |
| |\ | |||||
| | * | MDEV-3846 REFRESH_CHECKPOINT and REFRESH_TABLE_STATS tokens share the same value | Sergei Golubchik | 2013-01-09 | 1 | -32/+32 |
| * | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+3 |
* | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -3/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -3/+0 |
| |\ \ | | |/ | |||||
| | * | MDEV-3868 : windows client compilation issues | Vladislav Vaintroub | 2012-11-20 | 1 | -3/+0 |
| * | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-12-13 | 1 | -1/+1 |
| * | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -0/+2 |
| |/ | |||||
* | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 1 | -0/+1 |
* | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -2/+2 |
* | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -0/+9 |
|/ | |||||
* | a couple of minor post-5.5-merge cleanups | Sergei Golubchik | 2012-03-26 | 1 | -4/+1 |
* | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 1 | -0/+9 |
|\ | |||||
| * | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 1 | -0/+9 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+1 |
|\ \ | |||||
| * \ | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 1 | -0/+1 |
| | |/ | |||||
* | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -4/+7 |
|\ \ \ | |/ / | |||||
| * | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -4/+7 |
* | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+3 |
|\ \ \ | |||||
| * \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ | |||||
* | | | | | fixes for windows | Sergei Golubchik | 2011-10-21 | 1 | -0/+3 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+6 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -0/+2 |
| * | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -1/+1 |
| * | | | | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK" | Michael Widenius | 2011-04-28 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -2/+10 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Bug#60111 storage type for table not saved in .frm | Magnus BlÄudd | 2011-03-04 | 1 | -0/+4 |
| * | | | | 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 |
| * | | | | Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW over | Konstantin Osipov | 2010-11-12 | 1 | -1/+5 |
| * | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -3/+12 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -3/+0 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -28/+38 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -0/+4 |
| |\ \ \ | |||||
| * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -3/+12 |
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | fix for a possible DoS in the my_net_skip_rest() | Sergei Golubchik | 2010-02-23 | 1 | -1/+1 |
| * | | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -1/+2 |
| | |/ / / | |||||
| * | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -0/+6 |
| |/ / / | |||||
| * | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -2/+22 |
| |\ \ \ | |||||
| * \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -2/+33 |
| |\ \ \ \ | |||||
| * | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -2/+7 |
| * | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 1 | -9/+3 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -9/+3 |
| | |\ \ \ \ \ |