Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -10/+13 |
|\ | |||||
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -10/+13 |
| |\ | |||||
| | * | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -7/+0 |
| | |\ | |||||
| | | * | merge of mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-06-06 | 1 | -3/+11 |
| | | |\ | |||||
| | | * \ | merge 5.0 => 5.1 : Bug#12329653 | Tor Didriksen | 2011-05-04 | 1 | -7/+0 |
| | | |\ \ | |||||
| | | | * | | Bug#12329653 - EXPLAIN, UNION, PREPARED STATEMENT, CRASH, SQL_FULL_GROUP_BY | Tor Didriksen | 2011-05-04 | 1 | -7/+0 |
| | | | * | | Bug #11764517: 57359: POSSIBLE TO CIRCUMVENT SECURE_FILE_PRIV | Georgi Kodinov | 2011-04-28 | 1 | -0/+2 |
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+15 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | merge from latest 5.1 | Guilhem Bichot | 2011-05-21 | 1 | -0/+8 |
| | | |\ \ \ | |||||
| | | | * | | | Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED | Mayank Prasad | 2011-05-18 | 1 | -0/+8 |
| | | | |/ / | |||||
| | | * | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -3/+3 |
| | | |/ / | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| | | | |/ | | | |/| | |||||
| | | * | | Postfix bug#49124 | Libing Song | 2011-01-26 | 1 | -1/+1 |
| | | * | | BUG#49124 Security issue with /*!-versioned */ SQL statements on Slave | unknown | 2011-01-15 | 1 | -1/+1 |
* | | | | | Fixed build failure in embedded library regarding that decrease_user_connecti... | Michael Widenius | 2011-08-16 | 1 | -0/+3 |
* | | | | | Merge 5.1->5.2 | unknown | 2011-07-21 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | The function description added. | unknown | 2011-07-21 | 1 | -0/+1 |
* | | | | | merge | Vladislav Vaintroub | 2011-05-12 | 1 | -0/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Bugfix: New table creation/renaming block added if old encoded table present. | unknown | 2011-05-11 | 1 | -0/+5 |
* | | | | | Automatic merge with 5.1 | Michael Widenius | 2011-05-04 | 1 | -8/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed build errors on centos5-amd64-minimal, where we compile with very few c... | Michael Widenius | 2011-05-04 | 1 | -8/+8 |
* | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+6 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". | Dmitry Shulga | 2011-03-15 | 1 | -0/+1 |
| | * | | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they... | Alexander Barkov | 2011-02-18 | 1 | -1/+5 |
| | |/ / | |||||
* | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi... | Michael Widenius | 2011-03-23 | 1 | -1/+2 |
* | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -5/+30 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -5/+30 |
| |\ \ \ | | |/ / | |||||
| | * | | BUG#46166 | Luis Soares | 2010-12-16 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error | Luis Soares | 2010-11-30 | 1 | -1/+1 |
| | * | | | Fixed following problems: | Sergey Glukhov | 2010-12-14 | 1 | -4/+29 |
| | |/ / | |||||
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#56423: Different count with SELECT and CREATE SELECT queries | Martin Hansson | 2010-10-07 | 1 | -1/+2 |
* | | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 1 | -1/+1 |
* | | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -1/+1 |
* | | | | sane implementation of Key_% status variables. | Sergei Golubchik | 2010-10-29 | 1 | -2/+1 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -4/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -0/+1 |
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | BUG#49124 Security issue with /*!-versioned */ SQL statements on Slave | unknown | 2010-07-29 | 1 | -1/+1 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -47/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -47/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -45/+2 |
| | * | | A 5.1-only version of fix for bug #46947 "Embedded SELECT | Dmitry Lenev | 2010-05-28 | 1 | -1/+2 |
| | * | | Bug #53804: serious flaws in the alter database .. upgrade | Gleb Shchepa | 2010-05-21 | 1 | -0/+1 |
| | * | | merge | Mattias Jonsson | 2010-05-10 | 1 | -1/+1 |
| | |\ \ |