Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 15 | -160/+2530 |
|\ | |||||
| * | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -14/+16 |
| * | Added mytop to distribution (with some small trivial changes to make it workg... | Michael Widenius | 2011-06-27 | 5 | -2/+2350 |
| * | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 3 | -11/+11 |
| |\ | |||||
| | * | microseconds in log tables: | Sergei Golubchik | 2011-05-19 | 2 | -6/+6 |
| | * | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 3 | -5/+5 |
| * | | merge | Vladislav Vaintroub | 2011-03-26 | 7 | -46/+88 |
| |\ \ | |||||
| | * \ | Merge with base 5.2 | Michael Widenius | 2011-03-23 | 7 | -47/+86 |
| | |\ \ | |||||
| | | * | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi... | Michael Widenius | 2011-03-23 | 2 | -16/+38 |
| | | * | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 7 | -31/+48 |
| * | | | | merge | Vladislav Vaintroub | 2011-03-11 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | fix warning | Vladislav Vaintroub | 2011-03-11 | 1 | -1/+1 |
| * | | | | merge | Vladislav Vaintroub | 2011-03-11 | 1 | -1/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | remove unused variable | Vladislav Vaintroub | 2011-03-11 | 1 | -1/+0 |
| * | | | | merge mwl#55 | Vladislav Vaintroub | 2011-03-11 | 3 | -56/+100 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -5/+2 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 3 | -56/+100 |
| * | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -5/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -5/+2 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -5/+2 |
| | | |\ \ | |||||
| * | | \ \ | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | merge with 5.1 | Michael Widenius | 2011-01-07 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Don't do DBUG_ASSERT for checksum errors when using REPAIR | Michael Widenius | 2011-01-07 | 1 | -1/+1 |
| * | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -5/+7 |
| |/ / / / | |||||
| * | | | | Merge with 5.1 | Michael Widenius | 2010-12-04 | 1 | -2/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings | Vladislav Vaintroub | 2010-12-01 | 1 | -4/+2 |
* | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -5/+2 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 17 | -366/+196 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | merge mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2011-04-07 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | merge mysql-5.0-security->mysql-5.1-security | Georgi Kodinov | 2011-03-21 | 1 | -0/+1 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | Bug #59815: Missing License information with enterprise GPL packages | Georgi Kodinov | 2011-02-08 | 1 | -0/+1 |
| * | | | | | | Merged the fix for bug #11936829 to 5.5.11 release | Georgi Kodinov | 2011-03-31 | 1 | -0/+1 |
| * | | | | | | Bug # 11766011: mysql.user.authentication_string column causes | Georgi Kodinov | 2011-03-18 | 2 | -3/+3 |
| * | | | | | | BUG#59752 : mysql.user.plugin length (60) vs. mysql.plugin.name length (64) | Chuck Bell | 2011-03-11 | 2 | -3/+3 |
| * | | | | | | Merge | Kent Boortz | 2010-12-29 | 12 | -3/+154 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge | Kent Boortz | 2010-12-29 | 13 | -2/+183 |
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | | | |||||
| | | * | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 16 | -4/+216 |
| * | | | | | bug#51925: 5.5 installed header file layout is incorrect | Jonathan Perkin | 2010-12-17 | 1 | -2/+2 |
| * | | | | | bug#51925: 5.5 installed header file layout is incorrect | Jonathan Perkin | 2010-12-17 | 1 | -1/+5 |
| * | | | | | Merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-11-24 | 2 | -4/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge from mysql-5.0-bugteam. | Alexander Nozdrin | 2010-11-24 | 2 | -5/+5 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remov... | Alexander Nozdrin | 2010-11-24 | 3 | -5/+5 |
| * | | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 2 | -328/+0 |
| * | | | | | Bug #57551: Live upgrade fails between 5.1.52 -> 5.5.7-rc | Georgi Kodinov | 2010-11-19 | 1 | -1/+8 |
| * | | | | | add missing COMPONENT to all CMake INSTALL commands | Vladislav Vaintroub | 2010-11-13 | 1 | -1/+1 |
| * | | | | | Merge mysql-5.5-bugteam --> local bugfixing branch | Marc Alff | 2010-11-08 | 3 | -9/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bug #57916: Fix the naming of the proxy_priv table | Georgi Kodinov | 2010-11-02 | 3 | -9/+9 |
| * | | | | | | Bug#57609 performance_schema does not work with lower_case_table_names | Marc Alff | 2010-11-03 | 1 | -17/+17 |
| |/ / / / / | |||||
| * | | | | | Bug#57154 Rename THREADS.ID to THREADS.PROCESSLIST_ID in 5.5 | Marc Alff | 2010-10-06 | 1 | -2/+2 |
| * | | | | | Fix compile error on Windows after WL#1054 push. | Vladislav Vaintroub | 2010-10-04 | 1 | -2/+0 |