summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-7/+290
* Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-4/+4
|\
| * MDEV-26: Global transaction ID. First alpha release.unknown2013-04-151-4/+4
| |\
| | * MDEV-500: Session variable for server_idunknown2012-10-231-4/+4
* | | 10.0-base mergeSergei Golubchik2013-04-151-117/+63
|\ \ \ | |/ /
| * | MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).Alexey Botchkov2013-04-131-1/+2
| * | MDEV-3917 multiple use locks (GET_LOCK) in one connection.Alexey Botchkov2013-04-121-10/+15
| * | split THD::make_lex_string() in twoSergei Golubchik2013-04-071-27/+3
| * | 5.5 mergeSergei Golubchik2013-03-271-45/+34
| |\ \
| | * | MDEV-4066 semisync_master + temporary tables causes memory leaksSergei Golubchik2013-03-051-6/+6
| | * | 5.3->5.5 mergeSergei Golubchik2013-02-281-1/+1
| | |\ \
| | | * \ 5.2 -> 5.3Sergei Golubchik2013-02-281-1/+1
| | | |\ \
| | | | * \ 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-1/+1
| | | | |\ \
| | | | | * | a simpler fix forSergei Golubchik2013-02-281-1/+1
| | * | | | | revertSergei Golubchik2013-02-281-36/+7
| | * | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-3/+21
| | |\ \ \ \ \
| | | * | | | | This patch fixes bug#14729757 - MY_HASH_SEARCH(&XID_CACHE,Dmitry Shulga2012-12-061-3/+8
| | | * | | | | BUG#12669186: AUTOINC VALUE PERSISTENCY BREAKS CERTAIN REPLICATION SCENARIOSNuno Carvalho2012-11-141-0/+13
| | | * | | | | BUG#14458232 - CRASH IN THD_IS_TRANSACTION_ACTIVE DURINGThayumanavar2012-11-091-0/+12
| | | * | | | | Bug#14466617 - INVALID WRITES AND/OR CRASH WITH USERPraveenkumar Hulakund2012-11-071-39/+19
| * | | | | | | Speed up connection time:Michael Widenius2013-03-251-33/+8
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | [NOT] EXISTS to IN transformation.unknown2013-02-261-1/+1
* | | | | | | 10.0-base mergeSergei Golubchik2013-01-311-38/+86
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.5 mergeSergei Golubchik2013-01-291-28/+43
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 5.3 mergeSergei Golubchik2013-01-251-0/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | 5.2 mergeSergei Golubchik2013-01-251-0/+1
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | MDEV-3915 COM_CHANGE_USER allows fast password brute-forcingSergei Golubchik2013-01-251-0/+1
| | | * | | | 5.2 merge.Sergei Golubchik2012-08-221-3/+18
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | 5.1 mergeSergei Golubchik2012-08-221-3/+18
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-3/+18
| | | | | |\ \
| | | | | | * | Bug#12636001 : deadlock from thd_security_contextGopal Shankar2012-05-171-2/+11
| | * | | | | | simplify THD::binlog_setup_trx_data() usageSergei Golubchik2013-01-181-1/+1
| | * | | | | | MDEV-4065 thd_kill_statement serviceSergei Golubchik2013-01-181-9/+24
| | * | | | | | remove thd_mark_as_hard_kill()Sergei Golubchik2013-01-151-12/+0
| | * | | | | | Fixed some race conditons and bugs related to killed queriesMichael Widenius2013-01-111-14/+30
| * | | | | | | cleanup:Sergei Golubchik2013-01-231-1/+1
| * | | | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-1/+1
| * | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-11/+43
| * | | | | | | MDEV-3982: show_explain.test fails, times out or crashesSergey Petrunya2013-01-101-3/+7
* | | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | MDEV-3945 - do not hold LOCK_thread_count when freeing THD.Vladislav Vaintroub2012-12-211-1/+0
* | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-38/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-38/+0
| * | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-0/+70
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | merge with 5.5Sergei Golubchik2012-11-031-0/+70
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | mysql-5.5.28Sergei Golubchik2012-10-161-0/+70
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug#13699303 - THREAD POOL PLUGIN IGNORES TIMEOUT.Thayumanavar2012-07-251-0/+23
* | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-8/+182
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-2/+33
| |\ \ \ \ \ \ \