Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.2. | Michael Widenius | 2011-12-11 | 48 | -168/+1698 |
|\ | |||||
| * | Merge with 5.1 | Michael Widenius | 2011-12-03 | 1 | -2/+11 |
| |\ | |||||
| | * | Added suppressions | Michael Widenius | 2011-12-03 | 1 | -2/+11 |
| * | | Fix intermittently failing variables-notembedded test case. | Vladislav Vaintroub | 2011-12-01 | 1 | -1/+6 |
| * | | Automatic merge | Michael Widenius | 2011-11-24 | 45 | -157/+1701 |
| |\ \ | |||||
| | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 46 | -158/+1701 |
| | |\ \ | | | |/ | |||||
| | | * | Fixes for build failuers found by buildbot | Michael Widenius | 2011-11-24 | 2 | -38/+7 |
| | | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 16 | -79/+624 |
| | | |\ | |||||
| | | | * | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2011-10-24 | 2 | -15/+18 |
| | | | |\ | |||||
| | | | | * | Merge. | Sergey Vojtovich | 2011-10-21 | 1 | -0/+18 |
| | | | | |\ | |||||
| | | | | | * | BUG#11757032 - 49030: OPTIMIZE TABLE BREAKS MYISAM TABLE WHEN | Sergey Vojtovich | 2011-10-20 | 1 | -0/+18 |
| | | | | * | | Remove copyright header from parser_stack.test | Bjorn Munch | 2011-10-19 | 1 | -15/+0 |
| | | | | |/ | |||||
| | | | * | | merge 5.0-security => 5.1 security | Tor Didriksen | 2011-10-14 | 1 | -0/+21 |
| | | | |\ \ | |||||
| | | | | * | | Bug#12563865 ROUNDED,TMP_BUF,DECIMAL_VALUE STACK CORRUPTION IN ALL VERSIONS >... | Tor Didriksen | 2011-10-14 | 1 | -0/+21 |
| | | | * | | | auto-merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-10-12 | 10 | -13/+201 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||||
| | | | | * | | merge 5.1-mtr => 5.1 | Bjorn Munch | 2011-10-05 | 1 | -2/+0 |
| | | | | |\ \ | |||||
| | | | | | * | | Bug #12844282 62075: MTR TESTS SHOULD NOT HAVE TO SAVE & RESET INNODB_FILE_FO... | Bjorn Munch | 2011-09-27 | 1 | -2/+0 |
| | | | | * | | | Bug#11747970 34660: CRASH WHEN FEDERATED TABLE LOSES CONNECTION DURING INSERT... | Sergey Glukhov | 2011-10-05 | 1 | -0/+14 |
| | | | | * | | | BUG#11759349 - 51655: CREATE TABLE IN MEMORY ENGINE DOESN'T STORE | Ashish Agarwal | 2011-09-27 | 2 | -11/+11 |
| | | | | |/ / | |||||
| | | | | * | | merge from 5.1 main | Bjorn Munch | 2011-09-26 | 6 | -0/+152 |
| | | | | |\ \ | |||||
| | | | | | * \ | Merge. | Sergey Vojtovich | 2011-09-16 | 1 | -0/+45 |
| | | | | | |\ \ | |||||
| | | | | | | * | | BUG#11761180 - 53646: MYISAMPACK CORRUPTS TABLES WITH | Sergey Vojtovich | 2011-09-16 | 1 | -0/+45 |
| | | | | | * | | | Merge from mysql-5.1.59-release | unknown | 2011-09-15 | 5 | -0/+107 |
| | | | | | |\ \ \ | |||||
| | | | | * | | | | | Bug #12793118 MYSQLTEST: --ERROR AND --DISABLE_ABORT_ON_ERROR DO NOT WORK FOR... | Bjorn Munch | 2011-09-14 | 1 | -0/+25 |
| | | | | |/ / / / | |||||
| | | | * | | | | | manual merge | Tatjana Azundris Nuernberg | 2011-09-29 | 1 | -4/+357 |
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | | | |||||
| | | | | * | | | | Bug#11765687 (MySQL58677): No privilege on table / view, but can know #rows /... | Tatjana Azundris Nuernberg | 2011-09-29 | 1 | -4/+358 |
| | | | * | | | | | merge into 5.1-sec of bug#11766879. | Mattias Jonsson | 2011-09-15 | 1 | -2/+26 |
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | |||||
| | | | | * | | | | Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB, | Mattias Jonsson | 2011-08-23 | 1 | -2/+25 |
| | | | * | | | | | Manual merge from mysql-5.1. | Ramil Kalimullin | 2011-08-09 | 2 | -1/+36 |
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | | | |||||
| | | | * | | | | | automerge 5.0->security => 5.1-security | Tor Didriksen | 2011-07-18 | 1 | -2/+4 |
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | | | |||||
| | | | | * | | | | Bug#12406055 post-push fix: ignore float output | Tor Didriksen | 2011-07-18 | 1 | -2/+4 |
| | | | * | | | | | merge 5.0-security => 5.1-security | Tor Didriksen | 2011-07-15 | 1 | -0/+15 |
| | | | |\ \ \ \ \ | | | | | |/ / / / | |||||
| | | | | * | | | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REAL | Tor Didriksen | 2011-07-15 | 1 | -0/+15 |
| | | | | * | | | | Merge from mysql-5.0.94-release | Sunanda Menon | 2011-07-06 | 6 | -8/+166 |
| | | | | |\ \ \ \ | |||||
| | | | | | * | | | | Addendum 3 for bug #BUG#11764517 : expand secure_file_priv to the real | Georgi Kodinov | 2011-05-05 | 1 | -4/+10 |
| | | | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -0/+10 |
| | | | | |\ \ \ \ \ | |||||
| | | | * | | | | | | | Bug#11765255 - 58201: VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNC... | Tor Didriksen | 2011-07-11 | 2 | -0/+48 |
| | | | * | | | | | | | weave merge of mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-07-07 | 3 | -3/+59 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | auto-merge of mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-06-16 | 4 | -0/+250 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Fixed bug#11840395 (formerly known as bug#60347: THE STRING "VERSIONDATA" | Dmitry Shulga | 2011-06-09 | 2 | -0/+40 |
| | | * | | | | | | | | | | Fixes of testcases after merge with MySQL 5.1.59 | Michael Widenius | 2011-11-23 | 1 | -0/+2 |
| | | * | | | | | | | | | | Automatic merge | Michael Widenius | 2011-11-21 | 29 | -42/+1070 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 29 | -42/+1070 |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | |||||
| | | | | * | | | | | | | | | Bug#11765254 - 58200: ASSERTION FAILED: PARAM.SORT_LENGTH WHEN | Norvald H. Ryeng | 2011-08-30 | 1 | -0/+14 |
| | | | | * | | | | | | | | | BUG#12911710 - VALGRIND FAILURE IN ROW-DEBUG:PERFSCHEMA.SOCKET_SUMMARY_BY_INS... | Tor Didriksen | 2011-08-29 | 1 | -0/+14 |
| | | | | * | | | | | | | | | Merge. | Sergey Vojtovich | 2011-08-24 | 1 | -0/+45 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILD | Sergey Vojtovich | 2011-08-18 | 1 | -0/+45 |
| | | | | * | | | | | | | | | | merge | Tatjana Azundris Nuernberg | 2011-08-08 | 1 | -0/+33 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | |||||
| | | | | | * | | | | | | | | | Bug#11758414/Bug#50614: Default storage_engine not honored when set from with... | Tatjana Azundris Nuernberg | 2011-07-12 | 1 | -0/+33 |
| | | | | * | | | | | | | | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN... | Sergey Glukhov | 2011-08-02 | 1 | -0/+27 |
| | | | | | |_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | |