Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | after merge changes: | Sergei Golubchik | 2011-12-12 | 1 | -1/+1 |
* | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -3/+4 |
|\ | |||||
| * | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -2/+2 |
| * | Added MariaDB executable comment syntax: /*M!##### */ | Michael Widenius | 2011-08-29 | 1 | -2/+3 |
* | | merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ | |||||
| * | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -2/+2 |
* | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | * | | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -10/+71 |
| | | |\ \ | |||||
| | | | * \ | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -0/+47 |
| | | | |\ \ | |||||
| | | | | * \ | Manual merge | Kristofer Pettersson | 2009-03-06 | 1 | -5/+19 |
| | | | | |\ \ | |||||
| | | | | * | | | Bug#37416 When SQL_NO_CACHE is used, MySQL still lookup into the query cache | Kristofer Pettersson | 2008-10-14 | 1 | -0/+47 |
| | | | * | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -5/+5 |
| | | | | |/ / | | | | |/| | | |||||
| | | * | | | | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -1/+1 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | * | | | | Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release | unknown | 2007-11-07 | 1 | -0/+6 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -3/+15 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -3/+15 |
| | | | |\ \ \ \ \ | |||||
* | | | | | | | | | | bugfix: query cache was using incorrect wait flag | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
* | | | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -123/+411 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 1 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge | Igor Babaev | 2011-05-20 | 1 | -4/+5 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -4/+5 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -4/+5 |
| * | | | | | | | | | | | | Fixed compile failure when we don't use system zlib | Michael Widenius | 2011-06-09 | 1 | -9/+12 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -112/+425 |
| * | | | | | | | | | | | Fix compile error on Unixes | Vladislav Vaintroub | 2011-05-14 | 1 | -1/+1 |
| * | | | | | | | | | | | LPBUG#782223 : Memory released by Query_cache::resize() or Query_cache::free(... | Vladislav Vaintroub | 2011-05-14 | 1 | -0/+12 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -5/+56 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -5/+56 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | |||||
* | | | | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -55/+70 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix compilation warnings. | Alexander Nozdrin | 2010-10-12 | 1 | -1/+2 |
| * | | | | | | | | | | | Bug#56822: Add a thread state for sessions waiting on the query cache lock | Davi Arnaut | 2010-10-08 | 1 | -3/+19 |
| * | | | | | | | | | | | Bug#56822: Add a thread state for sessions waiting on the query cache lock | Davi Arnaut | 2010-10-07 | 1 | -10/+11 |
| * | | | | | | | | | | | Bug#56822: Add a thread state for sessions waiting on the query cache lock | Davi Arnaut | 2010-10-07 | 1 | -39/+35 |
| * | | | | | | | | | | | Bug#56452 Assertion failed: thd->transaction.stmt.is_empty() || | Magne Mahre | 2010-10-06 | 1 | -0/+10 |
* | | | | | | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -2/+1 |
* | | | | | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -3/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -1/+1 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Changed version number from RC to stable | Michael Widenius | 2010-01-29 | 1 | -3/+22 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -4/+35 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merged patch from Percona to get proper fix for compilation issue of srv0srv.... | Michael Widenius | 2010-01-12 | 1 | -2/+2 |
| * | | | | | | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -7/+8 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -0/+5 |
| * | | | | | | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -202/+210 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | |