summaryrefslogtreecommitdiff
path: root/sql/sql_parse.h
Commit message (Expand)AuthorAgeFilesLines
* MW-86 Additional wsrep_sync_wait coverageDaniele Sciascia2017-08-141-2/+2
* MW-86 Add separate wsrep_sync_wait bitmask value for SHOW commandsDaniele Sciascia2017-08-141-0/+5
* Refs: MW-360, white space fixsjaakola2017-08-111-1/+0
* Refs: MW-360 * reverted WSREP_TO_ISOLATION macros back to original formsjaakola2017-08-111-4/+21
* Refs: MW-360 * splitting DROP TABLE query in separate DROP commands for tempo...sjaakola2017-08-111-22/+4
* Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-1/+2
|\
| * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-1/+2
| |\
| | * race-condition safe implementation of test_if_data_home_dir()Sergei Golubchik2017-02-271-1/+2
* | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-131-0/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-0/+1
| |\ \ | | |/
| | * reduce code duplication a littlemariadb-5.5.54Sergei Golubchik2016-12-221-0/+1
* | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-1/+2
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-1/+2
| |\ \ | | |/
| | * MDEV-9142 :Adding Constraint with no database referenceJan Lindström2016-04-231-1/+2
* | | Fix for test failures.Nirbhay Choubey2016-02-231-3/+5
* | | PXC-391: Avoid Total Order Isolation (TOI) for LOCAL sql admin commands.Raghavendra D Prabhu2016-02-221-0/+7
* | | maria-10.0.16 mergeNirbhay Choubey2015-01-261-0/+3
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2015-01-211-0/+3
| |\ \ | | |/
| | * mysql-5.5.41 mergeSergei Golubchik2014-12-191-0/+3
| | |\
| | | * Bug#18790730 - CROSS-DATABASE FOREIGN KEY WITHOUT PERMISSIONSPraveenkumar Hulakund2014-09-101-0/+3
* | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-1/+1
|\ \ \ \ | |/ / /
| * | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-1/+1
* | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-4/+5
|\ \ \ \ | |/ / /
| * | | 10.0-base mergeSergei Golubchik2013-11-131-1/+1
| |\ \ \
| | * \ \ 5.5. mergeSergei Golubchik2013-11-131-1/+1
| | |\ \ \ | | | |/ /
| | | * | MDEV-4824 userstats - wrong user statisticsSergei Golubchik2013-11-111-1/+1
| * | | | 10.0-base merge (roles)Sergei Golubchik2013-10-291-3/+4
| |\ \ \ \ | | |/ / /
| | * | | support DEFINER=role and DEFINER=current_roleSergei Golubchik2013-10-181-3/+3
| | * | | cleanupSergei Golubchik2013-10-181-0/+1
* | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-3/+2
|\ \ \ \ \ | |/ / / /
| * | | | 10.0-monty mergeSergei Golubchik2013-07-211-3/+2
| |\ \ \ \
| | * | | | fix pfs_digest* tests.Sergei Golubchik2013-07-141-3/+2
* | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+16
|/ / / / /
* | | | | 10.0 mergeSergei Golubchik2013-04-191-1/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | cleanupSergei Golubchik2013-04-091-0/+1
| | |/ / | |/| |
| * | | extend check_global_access() to avoid my_error when it's not neededSergei Golubchik2013-03-191-1/+1
| |/ /
* | | Fixing check_access() not to be inlined in case ofAlexander Barkov2013-04-181-10/+9
|/ /
* | 5.3->5.5 mergeSergei Golubchik2011-11-221-2/+0
* | mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+1
|\ \ | |/
| * Updated/added copyright headersKent Boortz2011-06-301-1/+1
* | merge with 5.3Sergei Golubchik2011-10-191-0/+1
* | 5.5-mergeSergei Golubchik2011-07-021-3/+6
|\ \ | |/
| * Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they...Alexander Barkov2011-02-181-0/+6
| * Remove check_merge_table_access().Alexander Nozdrin2010-08-311-3/+0
* | lots of post-merge changesSergei Golubchik2011-04-251-1/+1
* | merge.Sergei Golubchik2010-11-251-1/+3
|/
* Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.Jon Olav Hauglid2010-08-181-0/+1
|\
| * Bug#49907: ALTER TABLE ... TRUNCATE PARTITION does not wait forMattias Jonsson2010-08-161-0/+1
* | Extract reload_acl_and_cache() and flush_tables_with_read_lock()Konstantin Osipov2010-08-131-2/+0
|/
* Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-1/+1
|\