Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+1 |
| |\ | |||||
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-5345 - Deadlock between mysql_change_user(), SHOW VARIABLES and | Sergey Vojtovich | 2014-01-28 | 1 | -2/+2 |
| | * | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | BUG#16032946 - PLEASE GIVE A MESSAGE FOR "THREAD_CONCURRENCY DOESN'T | Nisha Gopalakrishnan | 2013-09-05 | 1 | -1/+1 |
* | | | | MDEV-5521 SET ROLE as prepared statement crashes the server | Sergei Golubchik | 2014-01-28 | 1 | -4/+2 |
* | | | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -20/+26 |
|\ \ \ \ | |/ / / | |||||
| * | | | SET PASSWORD bugfixes: | Sergei Golubchik | 2013-10-18 | 1 | -17/+1 |
| * | | | cannot use lex->grant_user= ¤t_user, where LEX_USER current_user is a g... | Sergei Golubchik | 2013-10-18 | 1 | -5/+2 |
| * | | | Modified set_role_var to implement both a role check in the check() function, | Vicențiu Ciorbaru | 2013-10-17 | 1 | -2/+8 |
| * | | | Created new set_var_role class to handle the SET ROLE command | Vicențiu Ciorbaru | 2013-10-17 | 1 | -0/+19 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -3/+3 |
* | | | | | Merge from 10.0-connect | Alexander Barkov | 2013-06-08 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fixing the problem with my_bool_t defined two times. | Alexander Barkov | 2013-06-03 | 1 | -1/+1 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -10/+8 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -10/+8 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -11/+8 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Bug #16044655 CRASH: SETTING DEFAULT VALUE FOR SOME VARIABLES | Annamalai Gurusami | 2013-02-25 | 1 | -10/+7 |
* | | | | | | Merge 10.0-base -> 10.0 | unknown | 2013-05-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | |||||
| * | | | | Fixed errors and compiler warnings found by buildbot | Michael Widenius | 2013-05-05 | 1 | -1/+1 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -2/+109 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | create sys_var::val_str(), sys_var::val_int(), sys_var::val_real(). | Sergei Golubchik | 2013-04-09 | 1 | -2/+109 |
| * | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -19/+17 |
| |\ \ \ | | |/ / | |||||
* | | | | remove "invisible sysvars" oxymoron | Sergei Golubchik | 2013-02-02 | 1 | -8/+0 |
* | | | | small code cleanup taken from MySQL 5.6 | Sergei Golubchik | 2012-12-16 | 1 | -2/+2 |
* | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -19/+17 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -19/+17 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSION | Martin Hansson | 2012-08-24 | 1 | -20/+17 |
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-10-04 | 1 | -1/+1 |
| |/ / | |||||
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -5/+10 |
|/ / | |||||
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix trivial merge error | Sergey Petrunya | 2011-12-15 | 1 | -3/+2 |
| * | | Merge | Michael Widenius | 2011-12-14 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Fixed failure with query_cache.test for embedded server | Michael Widenius | 2011-12-13 | 1 | -2/+1 |
| * | | | The variable query_cache_strip_comments allowed in embedded server. | unknown | 2011-12-13 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+5 |
| |\ \ | |||||
| | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+5 |
| | |\ \ | |||||
| | | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+5 |
| | | |\ \ | |||||
| | | | * \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -5/+45 |
| | | | |\ \ | |||||
| * | | | | | | rename binlog_dbug_fsync_sleep -> debug_binlog_fsync_sleep | Sergei Golubchik | 2011-11-03 | 1 | -0/+3 |
| * | | | | | | Automatic merge | Michael Widenius | 2011-09-26 | 1 | -1/+13 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 1 | -1/+13 |
| * | | | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -2/+2 |
| |/ / / / / / |