Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+2 |
|\ | |||||
| * | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
* | | | Update copyright notices | Vladislav Vaintroub | 2012-02-28 | 1 | -1/+1 |
* | | | merge | Vladislav Vaintroub | 2012-01-24 | 1 | -2/+29 |
|\ \ \ | |||||
| * \ \ | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -0/+26 |
| |\ \ \ | | |/ / | |||||
| | * | | manual up-merge of Bug#11755281 | Tatjana Azundris Nuernberg | 2012-01-02 | 1 | -2/+27 |
| | |\ \ | | | |/ | |||||
| | | * | BUG#11755281/47032: ERROR 2006 / ERROR 2013 INSTEAD OF PROPER ERROR MESSAGE | Tatjana Azundris Nuernberg | 2012-01-02 | 1 | -2/+27 |
| * | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+3 |
| |\ \ \ | |||||
| | * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -4/+6 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+6 |
| | | |\ \ \ | |||||
| | | | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -44/+44 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||||
| | | | | * | | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -79/+138 |
| | | | | |\ \ | |||||
| | | | | | * | | Small update to Patch to fix SS #12698716 | Karen Langford | 2011-07-01 | 1 | -3/+3 |
| | | | | | * | | Patch to fix SS #12698716 : Java/ConnectorJ regression problem | Karen Langford | 2011-07-01 | 1 | -0/+20 |
| | | | | | * | | merge of mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-06-06 | 1 | -32/+105 |
| | | | | | |\ \ | |||||
| | | | | | * | | | bug#10064164 | Kristofer Pettersson | 2011-05-09 | 1 | -80/+119 |
| | | | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -48/+268 |
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| | | |||||
| | | | | | * | | | Bug#12563279: REGRESSION IN HANDLING PRE-4.1 AUTHENTICATION PACKET | Davi Arnaut | 2011-05-30 | 1 | -23/+98 |
| | | | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | | * | | | | | protocol safety fix: | Sergei Golubchik | 2011-07-07 | 1 | -3/+4 |
* | | | | | | | | | Initial threadpool implementation for MariaDB 5.5 | Vladislav Vaintroub | 2011-12-08 | 1 | -1/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | small cleanup | Sergei Golubchik | 2011-11-28 | 1 | -18/+3 |
* | | | | | | | | Add support for signed sysvars. | Sergei Golubchik | 2011-11-22 | 1 | -1/+1 |
* | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -6/+11 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 1 | -4/+9 |
| * | | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -3/+2 |
| * | | | | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -1/+2 |
* | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -2/+4 |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+11 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Automatic merge with 5.2 | Michael Widenius | 2011-08-16 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Fixed bug that MAX_USER_CONNECTIONS was not working properly in all situation... | Michael Widenius | 2011-08-16 | 1 | -4/+12 |
| * | | | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -0/+1 |
| * | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | many changes to my_getsystime.c: | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |
| * | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -4/+27 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -5/+29 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | * | | | | | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -2/+2 |
* | | | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -1/+1 |
* | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -24/+63 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | merge from latest 5.5 | Guilhem Bichot | 2011-05-21 | 1 | -11/+28 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge | Mikael Ronstrom | 2011-03-04 | 1 | -4/+27 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Simplify interface to connect methods in server | Mikael Ronström | 2011-02-10 | 1 | -11/+28 |
| * | | | | | | | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -5/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | / / | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -15/+13 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | automerge | Kristofer Pettersson | 2011-03-11 | 1 | -5/+29 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | | * | | | | | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they... | Alexander Barkov | 2011-02-18 | 1 | -5/+29 |
| | | | |_|_|/ / | | | |/| | | | |