summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2018-11-061-0/+3
|\
| * wsrep: create a macro for the error: labelSergei Golubchik2018-10-241-0/+3
* | Merge 10.1 into 10.2Marko Mäkelä2018-05-291-0/+2
|\ \ | |/
* | Merge remote-tracking branch 'origin/10.1' into 10.2Monty2018-05-241-3/+4
|\ \ | |/
| * Merge remote-tracking branch 'origin/10.0' into 10.1Monty2018-05-241-5/+6
| |\
| | * Fixes for Aria transaction handling with lock tablesMonty2018-05-221-6/+6
* | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-101-2/+5
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-081-2/+5
| |\ \ | | |/
| | * MDEV-15216 Assertion `! is_set() || m_can_overwrite_status' failed in Diagnos...Sergei Golubchik2018-05-081-2/+5
* | | Merge 10.1 into 10.2Marko Mäkelä2018-04-241-2/+2
|\ \ \ | |/ /
| * | Merge 10.0 into 10.1Marko Mäkelä2018-04-241-2/+2
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0Sergei Golubchik2018-04-201-1/+1
| | |\
| | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-04-191-1/+1
| | | |\
| | | | * BUG#27216817: INNODB: FAILING ASSERTION:mysql-5.5.60Nisha Gopalakrishnan2018-02-261-2/+2
| | * | | MDEV-15456 Server crashes upon adding or dropping a partition in ALTER under ...Sergei Golubchik2018-04-201-1/+1
* | | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-2/+1
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11539 test_if_reopen: Assertion `strcmp(share->unique_file_name,filename...Sergei Golubchik2018-01-251-2/+1
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-1/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-1/+0
| | |\ \ \ | | | |/ /
| | | * | MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-171-1/+0
* | | | | Fix warnings in Win64Vladislav Vaintroub2017-10-111-1/+2
* | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-1/+1
* | | | | MDEV-10555: Server crashes in mysql_admin_table upon killing ANALYZEOleksandr Byelkin2017-03-131-45/+67
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-1/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-1/+13
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-271-1/+13
| | |\ \ \ | | | |/ /
| | | * | MDEV-10424 - Assertion `ticket == __null' failed in MDL_request::set_typeSergey Vojtovich2016-08-171-1/+13
* | | | | MDEV-7901: re-implement analyze table for low impactOleksandr Byelkin2016-08-031-134/+165
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-10/+27
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-9155 Enabling Defragmenting in 10.1.8 still causes OPTIMIZE TABLE to tak...Sergei Golubchik2016-05-051-7/+26
| * | | | commentsSergei Golubchik2016-05-051-5/+3
* | | | | various cleanupsMichael Widenius2016-06-301-1/+1
* | | | | MDEV-5535: Cannot reopen temporary tableNirbhay Choubey2016-06-101-4/+4
* | | | | Code cleanupsSergey Vojtovich2016-06-101-1/+4
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-03-231-43/+51
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-9590: Always print "Engine-independent statistic" warnings and might be ...Oleksandr Byelkin2016-03-211-43/+51
* | | | | MDEV-9488 - Table cache cleanupsSergey Vojtovich2016-02-261-1/+1
|/ / / /
* | | | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-4/+3
|\ \ \ \
| * \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-4/+11
| |\ \ \ \ | | |/ / /
| * | | | Fix for test failures.Nirbhay Choubey2016-02-231-3/+0
| * | | | PXC-391: Avoid Total Order Isolation (TOI) for LOCAL sql admin commands.Raghavendra D Prabhu2016-02-221-2/+3
| * | | | Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-12/+45
| |\ \ \ \
| * \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-1/+1
| |\ \ \ \ \
| * | | | | | bzr merge -r4104..4120 codership/5.6/Nirbhay Choubey2014-08-121-0/+1
| * | | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-6/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-0/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-3/+4
| |\ \ \ \ \ \ \ \ \