summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with MySQL 5.1.53Michael Widenius2010-11-251-2/+0
|\
| * Bug#56226 Table map set to 0 after altering MyISAM tableunknown2010-10-111-2/+0
* | Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-031-1/+0
* | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-34/+57
* | Fix that one can run mysql_upgrade with long table namesMichael Widenius2010-09-031-4/+4
* | Merge with MySQL 5.1.50Michael Widenius2010-08-271-7/+7
|\ \ | |/
| * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-10/+4
| * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-3/+3
* | Merge with MySQL 5.1.49Michael Widenius2010-08-021-47/+111
|\ \ | |/
| * A 5.1-only version of fix for bug #46947 "Embedded SELECTDmitry Lenev2010-05-281-9/+25
| * BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in...Alfranio Correia2010-05-161-36/+58
| * mergeMattias Jonsson2010-05-101-11/+28
| |\
| | * Additional fix for DEBUG_SYNC which failed for some rpl-tests,Mattias Jonsson2010-03-181-1/+6
| | * Bug#50561: ALTER PARTITIONS does not have adequate lock, breaks withMattias Jonsson2010-03-171-11/+23
| * | BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in...Alfranio Correia2010-05-091-0/+10
| |/
* | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+17
|\ \ | |/
| * Automerge BUG 51226 bzr bundle from bug report --> myqsl-5.1-bugteam.Luis Soares2010-03-081-0/+3
| |\
| | * BUG#51226: mysqlbinlog replay: ERROR 1146 when using temp tablesLuis Soares2010-03-031-0/+3
| * | mergeMattias Jonsson2010-02-161-0/+1
| |\ \ | | |/ | |/|
| | * Manual merge (moved the check for log_table before name lock)Mattias Jonsson2010-02-121-0/+1
| | |\
| | | * Bug#42438: Crash ha_partition::change_table_ptrMattias Jonsson2010-02-011-0/+1
| * | | Bug#47734: Assertion failed: ! is_set() when locking a view with non-existing...Davi Arnaut2010-01-271-0/+13
| |/ /
* | | Fix buffer overflow in COM_FIELD_LIST.Kristian Nielsen2010-04-281-2/+6
* | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-6/+15
|\ \ \ | |/ /
| * | Backport Bug#37148 to 5.1He Zhenxing2010-01-241-5/+13
| * | Auto-merged.Evgeny Potemkin2009-12-021-1/+2
| |\ \ | | |/ | |/|
| | * Bug#48508: Crash on prepared statement re-execution.Evgeny Potemkin2009-12-011-1/+2
* | | When one does a drop table, the indexes are not flushed to disk before drop a...Michael Widenius2010-02-101-4/+13
* | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-1/+6
|\ \ \ | |/ /
| * | mergeKristofer Pettersson2009-11-201-1/+6
| |\ \
| | * | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-1/+6
* | | | Fixed Bug#47017 rpl_timezone fails on PB-2 with mismatch errorMichael Widenius2009-12-041-12/+19
* | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-34/+37
|\ \ \ \
| * \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-34/+37
| |\ \ \ \ | | |/ / /
| | * | | Manual Mergeunknown2009-11-031-0/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | BUG#48216 Replication fails on all slaves after upgrade to 5.0.86 on masterunknown2009-11-031-0/+1
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-4/+2
| | * | | BUG#42829: manually merged approved bzr bundle from bug report.Luis Soares2009-11-011-1/+11
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | BUG#42829: binlogging enabled for all schemas regardless ofLuis Soares2009-09-241-1/+11
| | * | | Bug #43029: FORCE INDEX FOR ORDER BY is ignored when join Georgi Kodinov2009-10-071-2/+4
| | * | | auto-mergeIngo Struewing2009-10-021-31/+17
| | |\ \ \
| | | * | | Bug #45677 Slave stops with Duplicate entry for key PRIMARY when using triggerunknown2009-10-011-31/+17
| | | |/ /
| | * | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+4
| | |/ /
* | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-1/+3
|/ / /
* | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-8/+11
|\ \ \ | |/ /
| * | merge mysql-5.0-bugteam --> mysql-5.1-bugteamAlfranio Correia2009-08-281-8/+11
| |\ \ | | |/
| | * auto-merge mysql-5.0-bugteam (local) --> mysql-5.0-bugteamAlfranio Correia2009-08-281-7/+12
| | |\
| | | * BUG#46861 Auto-closing of temporary tables broken by replicate-rewrite-dbAlfranio Correia2009-08-271-7/+12
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-48/+70
|\ \ \ \ | |/ / /
| * | | automergeGeorgi Kodinov2009-07-161-1/+7
| |\ \ \ | | |/ /