Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -0/+6 |
|\ | |||||
| * | Changed the names of the system tables for statistical data: | Igor Babaev | 2012-12-05 | 1 | -3/+3 |
| * | Changed the type of all double columns in the system statistical tables | Igor Babaev | 2012-06-25 | 1 | -2/+2 |
| * | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -0/+6 |
| |\ | |||||
| | * | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -0/+5 |
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -1/+1 |
* | | | Fixing test cases | Michael Widenius | 2012-08-23 | 1 | -0/+40 |
* | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -143/+1216 |
|/ / | |||||
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -0/+17 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -0/+17 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -0/+17 |
| | | |\ | |||||
* | | | \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 1 | -1/+1 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | * | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -0/+15 |
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | | | |||||
| | | * | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -0/+15 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -3/+4 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -5/+5 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | microseconds in log tables: | Sergei Golubchik | 2011-05-19 | 1 | -2/+2 |
| | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -3/+3 |
| | | |/ / | | |/| | | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -20/+24 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Bug # 11766011: mysql.user.authentication_string column causes | Georgi Kodinov | 2011-03-18 | 1 | -1/+1 |
| * | | | | BUG#59752 : mysql.user.plugin length (60) vs. mysql.plugin.name length (64) | Chuck Bell | 2011-03-11 | 1 | -1/+1 |
| * | | | | Merge mysql-5.5-bugteam --> local bugfixing branch | Marc Alff | 2010-11-08 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Bug #57916: Fix the naming of the proxy_priv table | Georgi Kodinov | 2010-11-02 | 1 | -3/+3 |
| * | | | | | 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 |
| * | | | | merge of mysql-5.5 into mysql-5.5-wl1054 | Georgi Kodinov | 2010-09-20 | 1 | -53/+33 |
| |\ \ \ \ | |||||
| * | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -1/+5 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -5/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -2/+2 |
| * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Bug#55416 Renaming of performance_schema tables for 5.5 | Marc Alff | 2010-08-12 | 1 | -53/+33 |
| |/ / |/| | | |||||
* | | | A patch for Bug#52444 (mysql_upgrade fails b/w 5.1 -> 5.5 (Celosia)). | Alexander Nozdrin | 2010-04-14 | 1 | -21/+1 |
* | | | Bug#45194 mysql_upgrade deletes existing data in performance_schema database/... | Marc Alff | 2010-03-05 | 1 | -5/+79 |
* | | | WL#2360 Performance schema | Marc Alff | 2010-01-11 | 1 | -0/+359 |
* | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -3/+3 |
|\ \ \ | |||||
| * \ \ | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| * | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -3/+3 |
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-10-27 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Bug#41049 does syntax "grant" case insensitive? | Sergey Glukhov | 2009-10-27 | 1 | -1/+1 |
| | * | Bug#34159: mysql_install_db fails with sql_mode=TRADITIONAL | Georgi Kodinov | 2008-07-31 | 1 | -0/+1 |
* | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | bug#33731 - INSTALL/UNINSTALL PLUGIN: Inconsistent handling of identifier case | Sergei Golubchik | 2009-10-12 | 1 | -1/+1 |
| |/ / | |||||
* | | | A backporting patch for WL#4300 (Define privileges for tablespaces). | Alexander Nozdrin | 2009-10-10 | 1 | -1/+1 |