Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -1/+2 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -1/+2 |
| |\ | |||||
| | * | MDEV-9142 :Adding Constraint with no database reference | Jan Lindström | 2016-04-23 | 1 | -1/+2 |
* | | | Fix for test failures. | Nirbhay Choubey | 2016-02-23 | 1 | -3/+5 |
* | | | PXC-391: Avoid Total Order Isolation (TOI) for LOCAL sql admin commands. | Raghavendra D Prabhu | 2016-02-22 | 1 | -0/+7 |
* | | | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2015-01-21 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.41 merge | Sergei Golubchik | 2014-12-19 | 1 | -0/+3 |
| | |\ | |||||
| | | * | Bug#18790730 - CROSS-DATABASE FOREIGN KEY WITHOUT PERMISSIONS | Praveenkumar Hulakund | 2014-09-10 | 1 | -0/+3 |
* | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -4/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | 5.5. merge | Sergei Golubchik | 2013-11-13 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-4824 userstats - wrong user statistics | Sergei Golubchik | 2013-11-11 | 1 | -1/+1 |
| * | | | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -3/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | support DEFINER=role and DEFINER=current_role | Sergei Golubchik | 2013-10-18 | 1 | -3/+3 |
| | * | | | cleanup | Sergei Golubchik | 2013-10-18 | 1 | -0/+1 |
* | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -3/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -3/+2 |
| |\ \ \ \ | |||||
| | * | | | | fix pfs_digest* tests. | Sergei Golubchik | 2013-07-14 | 1 | -3/+2 |
* | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+16 |
|/ / / / / | |||||
* | | | | | 10.0 merge | Sergei Golubchik | 2013-04-19 | 1 | -1/+2 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | cleanup | Sergei Golubchik | 2013-04-09 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
| * | | | extend check_global_access() to avoid my_error when it's not needed | Sergei Golubchik | 2013-03-19 | 1 | -1/+1 |
| |/ / | |||||
* | | | Fixing check_access() not to be inlined in case of | Alexander Barkov | 2013-04-18 | 1 | -10/+9 |
|/ / | |||||
* | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -2/+0 |
* | | 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 |
* | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -0/+1 |
* | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -3/+6 |
|\ \ | |/ | |||||
| * | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they... | Alexander Barkov | 2011-02-18 | 1 | -0/+6 |
| * | Remove check_merge_table_access(). | Alexander Nozdrin | 2010-08-31 | 1 | -3/+0 |
* | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -1/+3 |
|/ | |||||
* | Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime. | Jon Olav Hauglid | 2010-08-18 | 1 | -0/+1 |
|\ | |||||
| * | Bug#49907: ALTER TABLE ... TRUNCATE PARTITION does not wait for | Mattias Jonsson | 2010-08-16 | 1 | -0/+1 |
* | | Extract reload_acl_and_cache() and flush_tables_with_read_lock() | Konstantin Osipov | 2010-08-13 | 1 | -2/+0 |
|/ | |||||
* | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-07-29 | 1 | -1/+1 |
|\ | |||||
| * | Manual merge | unknown | 2010-07-29 | 1 | -1/+1 |
* | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -1/+0 |
|/ | |||||
* | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-15 | 1 | -3/+2 |
* | Merge trunk-bugfixing -> trunk-runtime | Konstantin Osipov | 2010-06-17 | 1 | -1/+1 |
|\ | |||||
| * | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -1/+1 |
* | | manual merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-06-06 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | BUG#50479 DDL stmt on row-only/stmt-only tables generate spurious binlog_format | Alfranio Correia | 2010-06-02 | 1 | -0/+1 |
* | | Bug#42643: InnoDB does not support replication of TRUNCATE TABLE | Davi Arnaut | 2010-05-25 | 1 | -5/+0 |
|/ | |||||
* | Patch for Bug#27863 (excessive memory usage for many small queries in a | Alexander Nozdrin | 2010-05-14 | 1 | -1/+1 |
* | A post-fix patch for WL#4877/WL#5030: | Alexander Nozdrin | 2010-04-12 | 1 | -1/+1 |
* | WL#5030: Splitting mysql_priv.h | Mats Kindahl | 2010-04-07 | 1 | -1/+5 |