Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -0/+38 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Bug #11761530: 54035: MSYQLD_SAFE BEHAVIOUR CONSUMES TOO MUCH CPU IF IT IS UN... | Georgi Kodinov | 2011-11-10 | 1 | -0/+38 | |
* | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-02-24 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Fixes for make_binary_distribution and mysql_config for OpenSuse 12.1 | Michael Widenius | 2012-02-23 | 2 | -2/+6 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | fix for bug 11748060/34981 | unknown | 2011-11-17 | 1 | -0/+3 | |
* | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 9 | -11/+64 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 20 | -15/+186 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | ||||||
| | * | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 20 | -15/+186 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 20 | -15/+187 | |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | ||||||
| | | * | | | | | Ensure that the last --datadir option is used from the my.cnf files. | Michael Widenius | 2011-07-24 | 1 | -4/+1 | |
| * | | | | | | | Added handler and temporary table usage to mytop | Michael Widenius | 2011-12-03 | 1 | -2/+36 | |
* | | | | | | | | rename debug variable to debug_dbug, to make test pass in release builds | Sergei Golubchik | 2011-12-15 | 1 | -1/+1 | |
* | | | | | | | | Fix build and packaging on Windows: | Vladislav Vaintroub | 2011-11-26 | 1 | -8/+2 | |
* | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 3 | -2/+6 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Remove extra MariaDB- from binary tar.gz file name | Michael Widenius | 2011-10-16 | 1 | -0/+1 | |
| * | | | | | | | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 3 | -3/+9 | |
* | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 20 | -32/+102 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||||
| * | | | | | | | Bug #58241 | Joerg Bruehe | 2011-09-13 | 3 | -769/+2 | |
| * | | | | | | | Local merge from mysql-5.1. | Nirbhay Choubey | 2011-09-06 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | * | | | | | | Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTED | Nirbhay Choubey | 2011-09-06 | 1 | -0/+5 | |
| * | | | | | | | Local merge from mysql-5.1. | Nirbhay Choubey | 2011-09-06 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Removing a stray line, went into the last push. | Nirbhay Choubey | 2011-09-06 | 1 | -1/+0 | |
| * | | | | | | | Local merge of patch for bug#11765888 from mysql-5.1. | Nirbhay Choubey | 2011-09-06 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTED | Nirbhay Choubey | 2011-09-06 | 1 | -0/+6 | |
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ | ||||||
| * | | | | | | | | BUG#11878394 - MYSQLD_SAFE TEST FOR ALREADY RUNNING PROCESS | Nirbhay Choubey | 2011-09-02 | 1 | -4/+4 | |
| * | | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 20 | -37/+45 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 18 | -38/+50 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | ||||||
| | | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 13 | -30/+43 | |
* | | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | |