Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -0/+4 |
* | Added read only system variable 'in_transaction' which tells if there's | Sergei Golubchik | 2011-07-01 | 1 | -19/+23 |
* | Merge with Sergei's tree to get in latest microsecond patches and also fixes ... | Michael Widenius | 2011-06-11 | 1 | -5/+11 |
|\ | |||||
| * | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -5/+11 |
| |\ | |||||
| | * | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -3/+7 |
* | | | Fixed compile failure when we don't use system zlib | Michael Widenius | 2011-06-09 | 1 | -1/+1 |
|/ / | |||||
* | | Change optimizer_use_mrr=auto|disable|force | Sergey Petrunya | 2011-06-03 | 1 | -11/+0 |
* | | Fix compile errors and warnings and test errors introduced by microseconds push. | Vladislav Vaintroub | 2011-05-28 | 1 | -1/+1 |
* | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -12/+11 |
|\ \ | |/ | |||||
| * | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |
| * | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -10/+10 |
* | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -13/+78 |
* | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -10/+50 |
|\ \ | |||||
| * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -10/+50 |
| |\ \ | |||||
| | * \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -11/+51 |
| | |\ \ | |||||
| | | * | | Bug #11766769: 59959: SMALL VALUES OF --MAX-ALLOWED-PACKET | Georgi Kodinov | 2011-03-25 | 1 | -2/+36 |
| | | * | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". | Dmitry Shulga | 2011-03-15 | 1 | -0/+6 |
| | | * | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they... | Alexander Barkov | 2011-02-18 | 1 | -1/+1 |
| | | * | | Bug#48053 String::c_ptr has a race and/or does an invalid | Magne Mahre | 2011-02-17 | 1 | -2/+2 |
| | | * | | merge to 5.1. | Georgi Kodinov | 2011-02-02 | 1 | -6/+6 |
| | | |\ \ | |||||
| | | | * | | Fixes for Bug #55755 and Bug #52315 part 2 | Georgi Kodinov | 2011-02-02 | 1 | -6/+6 |
* | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -66/+55 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -0/+3 |
* | | | | | | | | merge | Vladislav Vaintroub | 2011-03-29 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | lp:702084 - myisam_block_size is not reported in SHOW GLOBAL VARIABLES | Sergei Golubchik | 2011-03-28 | 1 | -0/+4 |
* | | | | | | | | merge | Vladislav Vaintroub | 2011-03-26 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi... | Michael Widenius | 2011-03-23 | 1 | -0/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -59/+44 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -58/+43 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -58/+43 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | 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 | -41/+2 |
| | | * | | | | merge | Tatiana A. Nurnberg | 2010-11-24 | 1 | -17/+40 |
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | Bug#43233: Some server variables are clipped during "update," not "check" stage | Tatiana A. Nurnberg | 2010-11-11 | 1 | -17/+40 |
| * | | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -8/+12 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -8/+12 |
* | | | | | | | Merge. | Igor Babaev | 2010-12-10 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge | Igor Babaev | 2010-11-05 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge 5.3-mwl128 -> 5.3 | Igor Babaev | 2010-10-27 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | The main patch for MWL#128: Implement Block Nested Loop Hash Join. | Igor Babaev | 2010-08-31 | 1 | -1/+4 |
* | | | | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge with 5.1 | Michael Widenius | 2010-12-04 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Fix problems seen in Buildbot: | unknown | 2010-12-02 | 1 | -0/+2 |
| * | | | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | * | | | | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -1/+1 |
| | | | |_|_|/ / | | | |/| | | | | |||||
* | | | | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -8/+12 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | |