Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -1/+2 |
|\ | |||||
| * | Use after free in authenticationmariadb-galera-5.5.60 | Sergei Golubchik | 2018-05-01 | 1 | -0/+1 |
| * | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-04-19 | 1 | -1/+1 |
| | |\ | |||||
| | | * | BUG#26881798: SERVER EXITS WHEN PRIMARY KEY IN MYSQL.PROC | Karthik Kamath | 2017-12-05 | 1 | -1/+3 |
| | | * | (no commit message) | Arun Kuruvila | 2016-11-28 | 1 | -1/+500 |
| | | * | Bug#23303391: HANDLE_FATAL_SIGNAL (SIG=11) IN ALLOC_QUERY | Arun Kuruvila | 2016-08-29 | 1 | -2/+8 |
| * | | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 1 | -14/+21 |
| |\ \ \ | |||||
| * \ \ \ | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 1 | -20/+23 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | bzr merge -rtag:mariadb-5.5.40 maria/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 1 | -27/+22 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -15/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -68/+172 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | References: lp:1066784 - Merged with MariaDB 5.5.28a | Seppo Jaakola | 2012-11-30 | 1 | -4/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | References lp:1066784 | Seppo Jaakola | 2012-10-23 | 1 | -1/+37 |
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 1 | -21/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Follow up to MDEV-12366: FLUSH privileges can break hierarchy of roles | Vicențiu Ciorbaru | 2017-12-21 | 1 | -15/+11 |
| * | | | | | | | | | | | | | | | MDEV-12366: FLUSH PRIVILEGES can break hierarchy of roles | Vicențiu Ciorbaru | 2017-12-19 | 1 | -12/+18 |
| * | | | | | | | | | | | | | | | MDEV-13655: Set role does not properly grant privileges. | Vicențiu Ciorbaru | 2017-12-19 | 1 | -15/+32 |
* | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -0/+50 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Fix check_role_is_granted for embedded | Vicențiu Ciorbaru | 2017-10-17 | 1 | -35/+39 |
| * | | | | | | | | | | | | | | | MDEV-13676: Field "create Procedure" is NULL, even if the the user has role w... | Vicențiu Ciorbaru | 2017-10-11 | 1 | -0/+46 |
* | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -6/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warning | Sergei Golubchik | 2017-05-15 | 1 | -6/+0 |
* | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | MDEV-5999 MySQL Bug#12766319 - 61865: RENAME USER DOES NOT WORK CORRECTLY - R... | Sergei Golubchik | 2017-02-27 | 1 | -2/+2 |
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | MDEV-10744: Roles are not fully case sensitive | Vicențiu Ciorbaru | 2016-12-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -7/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | [MDEV-9614] Roles and Users longer than 6 characters | Igor Pashev | 2016-06-22 | 1 | -7/+5 |
* | | | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -36/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -21/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-04-20 | 1 | -9/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | (no commit message) | Arun Kuruvila | 2016-02-23 | 1 | -8/+8 |
| | * | | | | | | | | | | | | | MDEV-9835 Valid password is not working after server restart | Sergei Golubchik | 2016-04-19 | 1 | -5/+12 |
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | MDEV-9580 SHOW GRANTS FOR <current_user> fails | Sergei Golubchik | 2016-04-24 | 1 | -13/+13 |
| * | | | | | | | | | | | | | SEGFAULT in get_column_grant() | Igor Pashev | 2016-04-21 | 1 | -1/+2 |
| * | | | | | | | | | | | | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | MDEV-9088 Server crashes on shutdown after the second post of feedback report | Sergei Golubchik | 2015-12-19 | 1 | -4/+0 |
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-12-09 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Bug #21602056 : CONCURRENT FLUSH PRIVILEGES + REVOKE/GRANT | Arun Kuruvila | 2015-10-14 | 1 | -0/+8 |