summaryrefslogtreecommitdiff
path: root/sql/handler.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-301-9/+10
|\
| * Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-301-8/+9
| |\
| | * Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-8/+9
| | |\
| | | * MDEV-13049 Querying INFORMATION_SCHEMA becomes slow in MariaDB 10.1Sergei Golubchik2017-10-091-8/+9
| * | | Reset table->record[1] early for sequences to fix comparision of innodb rowMonty2017-10-221-1/+1
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-10/+10
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-10/+10
| |\ \ \ | | |/ /
| | * | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-4/+4
| | * | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-6/+6
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-201-1/+1
| |\ \ \ | | |/ /
| | * | compiler warningSergei Golubchik2017-09-181-1/+1
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-011-9/+39
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-011-9/+39
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2017-08-311-9/+39
| | |\ \ | | | |/
| | | * Merge branch '10.0' into 10.1Marko Mäkelä2017-08-301-9/+34
| | | |\
| | | | * MDEV-13437 InnoDB fails to return error for XA COMMIT or XA ROLLBACK in read-...Andrei Elkin2017-08-291-9/+34
| | | * | Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-0/+5
| | | |\ \
| | | | * | MW-378 enabling build with WITH_WSREP=OFF only one fix here, enables build of...sjaakola2017-08-141-0/+5
| | | | * | Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-091-0/+4
| | | | |\ \ | | | | | |/
| | | | | * MDEV-8453 Alter table not returning engine errorsSergei Golubchik2017-08-011-0/+4
| | | | * | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-1/+1
| | | | |\ \ | | | | | |/
* | | | | | Changed KEY names to use LEX_CSTRINGMichael Widenius2017-08-241-4/+9
* | | | | | Lots of small cleanupsMichael Widenius2017-08-241-15/+17
* | | | | | Simplify test if we can use table in query cacheMichael Widenius2017-08-241-1/+1
* | | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-1/+1
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Marko Mäkelä2017-08-091-4/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-08-091-3/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | A followup to MDEV-13470: remove the code that is now uselessSergei Petrunia2017-08-091-3/+0
| | * | | | MDEV-13470 DELETE IGNORE should not ignore deadlocks (again)Marko Mäkelä2017-08-081-0/+6
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-08-071-2/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Follow the upstream MyRocks: provide details in the ER_LOCK_DEADLOCK messageSergei Petrunia2017-07-301-2/+9
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-07-071-1/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-071-1/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-051-1/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-13012 Assertion `share->error' failed in discover_handlerton upon execut...Sergei Golubchik2017-06-221-1/+6
* | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-07-031-0/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-251-0/+5
* | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-06-191-38/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Remove the unnecessary method handlerton::release_temporary_latches()Marko Mäkelä2017-06-161-38/+0
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-1/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.1 into 10.2Marko Mäkelä2017-06-081-0/+14
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2017-05-261-0/+14
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-201-2/+2
| | | |\ \ \
| | | * \ \ \ Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-3/+3
| | | |\ \ \ \
| | | * | | | | Fix wsrep_affected_rows.Sachin Setiya2017-03-161-1/+1
| | | * | | | | MW-313 Enforce wsrep_max_ws_rows also when binlog is enabledDaniele Sciascia2017-03-141-7/+9
| | | * | | | | MW-309 Fix wsrep_max_ws_rows so that it does not affect queriesSachin Setiya2017-03-131-50/+19
| | | * | | | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-131-1/+1
| | | |\ \ \ \ \
| * | | \ \ \ \ \ Merge 10.1 into 10.2Marko Mäkelä2017-05-221-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |