Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #12698716mysql-5.1.58 | 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-securityclone-5.1.58-build | 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 |
| | | | * | | 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 |
| | | | |\ | |||||
| | | | * | | Certain fields in the protcol required a strict formatting. If | Kristofer Pettersson | 2011-03-11 | 1 | -22/+145 |
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |/ / | |||||
| | * | | | protocol safety fix: | Sergei Golubchik | 2011-07-07 | 1 | -3/+4 |
* | | | | | 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 |
* | | | | | 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 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they... | Alexander Barkov | 2011-02-18 | 1 | -5/+29 |
| | | |/ | | |/| | |||||
| * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #49752: 2469.126.2 unintentionally breaks authentication against | Tatiana A. Nurnberg | 2010-11-11 | 1 | -0/+13 |
| | |/ | |||||
| * | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -2/+2 |
* | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -0/+6 |
| |\ \ | | |/ | |||||
| | * | Fix for bug #53912: Fails to build from source | Ramil Kalimullin | 2010-06-04 | 1 | -0/+2 |
| | * | Manual merge. | Davi Arnaut | 2010-04-29 | 1 | -0/+7 |
* | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -452/+6 |
* | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge MySQL 5.1.44 into MariaDB.mariadb-merge-mysql-5.1.44 | unknown | 2010-03-04 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Manual merge. | Davi Arnaut | 2009-12-18 | 1 | -1/+1 |
| * | | fix for a possible DoS in the my_net_skip_rest() | Sergei Golubchik | 2010-02-23 | 1 | -1/+2 |
* | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Changed version number from RC to stable | Michael Widenius | 2010-01-29 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -1/+1 |
* | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -6/+475 |
|/ / | |||||
* | | Merge MySQL->MariaDBmariadb-merge-mysql-5.1.38minus | Sergey Petrunya | 2009-09-08 | 1 | -4/+16 |
|\ \ | |/ | |||||
| * | Fix for a valgrind warning due to use of a uninitialized | Davi Arnaut | 2009-06-08 | 1 | -4/+16 |
* | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -1/+1 |
* | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 1 | -12/+15 |
* | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -1/+1 |
|/ | |||||
* | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2008-03-28 | 1 | -7/+16 |
|\ |