summaryrefslogtreecommitdiff
path: root/sql/sql_base.h
Commit message (Expand)AuthorAgeFilesLines
* merge of 2876.430.11 & 2876.430.1unknown2013-06-271-4/+2
* Applied all changes from Igor and SanjaMichael Widenius2013-06-151-22/+50
* Cassandra SE mergeunknown2013-01-101-0/+1
|\
| * pre-mergeunknown2012-12-231-0/+1
| |\
| | * MDEV-506 Cassandra dynamic columns accessunknown2012-09-281-0/+1
* | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-1/+2
|\ \ \ | |/ / |/| |
| * | Merge 5.5 -> mwl248Igor Babaev2013-01-081-1/+2
| |\ \
| | * | Implemented MDEV-3941: CREATE TABLE xxx IF NOT EXISTS should not block if tab...Michael Widenius2012-12-161-1/+2
* | | | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-1/+8
|\ \ \ \ | |/ / /
| * | | Addressed all remaining issues from the review of the patchIgor Babaev2012-12-131-16/+0
| * | | Fixed bug mdev-3891.Igor Babaev2012-12-121-3/+0
| * | | Addressed the following issue from the review of the patch forIgor Babaev2012-12-081-1/+2
| * | | Merge 5.5->mwl248Igor Babaev2012-12-041-1/+2
| |\ \ \ | | |/ /
| * | | Fixed bug mdev-504.Igor Babaev2012-09-081-1/+1
| * | | Performed re-factoring and re-structuring of the code for mwl#248:Igor Babaev2012-07-261-0/+3
| * | | Added procedures to delete records by keys from statistical tables.Igor Babaev2012-07-101-0/+7
| * | | Merge.Igor Babaev2012-05-181-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | The pilot implementation of mwl#250: Use the statistics from persistentIgor Babaev2012-04-111-0/+1
| * | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-1/+15
* | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-1/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | 5.3->5.5 mergeSergei Golubchik2012-11-221-1/+2
| | |/ | |/|
* | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-12-131-1/+0
* | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-5/+6
|/ /
* | Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close ...Michael Widenius2012-05-161-1/+1
|/
* merge with 5.3Sergei Golubchik2011-10-191-6/+23
* 5.5-mergeSergei Golubchik2011-07-021-14/+50
|\
| * Bug #11764779 (former 57649)Jon Olav Hauglid2011-03-071-2/+2
| * Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-3/+23
| * Remove a dead declaration.Konstantin Osipov2010-10-271-1/+0
| * Reverted a temporary workaround for bug #56405 "DeadlockDmitry Lenev2010-09-301-2/+0
| * Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-09-301-0/+2
| |\
| * | Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGEDmitry Lenev2010-09-151-1/+12
| * | Fix for bug #55273 "FLUSH TABLE tm WITH READ LOCK for MergeDmitry Lenev2010-09-091-0/+5
| * | Bug#27480 (Extend CREATE TEMPORARY TABLES privilegeAlexander Nozdrin2010-08-311-2/+3
| * | Remove unused enum (enum open_table_mode).Alexander Nozdrin2010-08-311-1/+0
| * | Bug#27480 (Extend CREATE TEMPORARY TABLES privilegeAlexander Nozdrin2010-08-311-2/+5
* | | merge.Sergei Golubchik2010-11-251-1/+2
| |/ |/|
* | A temporary workaround for bug #56405 "Deadlock in theDmitry Lenev2010-09-061-0/+2
|/
* Merge from mysql-5.5-runtime to mysql-5.5-bugfixing.Jon Olav Hauglid2010-08-201-35/+83
|\
| * Bug #56085 Embedded server tests fails with assert inJon Olav Hauglid2010-08-191-0/+30
| * Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.Jon Olav Hauglid2010-08-181-1/+0
| |\
| * | Extract reload_acl_and_cache() and flush_tables_with_read_lock()Konstantin Osipov2010-08-131-0/+43
| * | Remove dead code.Konstantin Osipov2010-08-121-2/+1
| * | Commit on behalf of Dmitry Lenev.Konstantin Osipov2010-08-121-8/+5
| |\ \
| | * | Fix for bug #52044 "FLUSH TABLES WITH READ LOCK and FLUSHDmitry Lenev2010-07-271-8/+3
| * | | A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". Konstantin Osipov2010-08-091-5/+4
| * | | Cleanup: remove unused declarations from sql_base.h.Konstantin Osipov2010-08-041-27/+0
* | | | BUG#53452 Inconsistent behavior of binlog_direct_non_transactional_updates withAlfranio Correia2010-08-201-1/+1
| |_|/ |/| |
* | | Bug#53676: Unexpected errors and possible tableMattias Jonsson2010-08-131-8/+0
|/ /
* | Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-291-1/+1
|\ \ | |/ |/|
View Lorry Controller Status