summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* MySQL 5.1 -> MariaDB 5.1 merge Sergey Petrunya2009-09-104-22/+11
* Merge MySQL->MariaDBSergey Petrunya2009-09-0896-12792/+4280
|\
| * Merge from mysql-5.1-bugteam.Davi Arnaut2009-08-117-24/+46
| |\
| | * Manual merge.Davi Arnaut2009-08-102-7/+10
| | |\
| | | * Bug#45010: invalid memory reads during parsing some strange statementsDavi Arnaut2009-08-071-7/+9
| | * | MergeMartin Hansson2009-08-102-13/+20
| | |\ \
| | | * | Bug#46454: MySQL wrong index optimisation leads to incorrect result & crashesMartin Hansson2009-08-072-13/+20
| | * | | Auto-mergeIgnacio Galarza2009-08-061-2/+15
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug #27535 Installing Windows service with --defaults-file option - quotation...Ignacio Galarza2009-08-061-2/+15
| | * | | Fix for BUG#45816 - assertion failure with index containing double Satya B2009-08-062-2/+1
| | | |/ | | |/|
| * | | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-118-87/+88
| |\ \ \ | | |/ / | |/| |
| | * | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-1475-995/+1820
| | |\ \
| | * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-108-87/+88
| * | | | Backport Tomas Ulin fix for a spurious failure on PushBuild:Davi Arnaut2009-08-011-1/+0
| * | | | Auto-mergeIgnacio Galarza2009-07-312-1/+13
| |\ \ \ \
| | * \ \ \ auto-mergeTatiana A. Nurnberg2009-07-3147-395/+954
| | |\ \ \ \
| | * | | | | Bug#40281, partitioning the general log table crashes the serverTatiana A. Nurnberg2009-07-312-1/+13
| * | | | | | Auto-mergeIgnacio Galarza2009-07-313-4/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-313-4/+4
| * | | | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-318-36/+169
| * | | | | Bug#46265: Can not disable warning about unsafe statements for binary loggingDavi Arnaut2009-07-311-1/+2
| * | | | | Bug#43435: LOCK_open does not use MY_MUTEX_INIT_FASTDavi Arnaut2009-07-301-1/+1
| * | | | | Manual merge.Davi Arnaut2009-07-301-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#46385: [Warning] option 'max_join_size': unsigned value 18446744073709551...Davi Arnaut2009-07-271-1/+1
| | * | | | Automerge.Alexey Kopytov2009-07-281-2/+11
| | |\ \ \ \
| | * \ \ \ \ merging with mysql-5.0-bugteamSatya B2009-07-2711-99/+105
| | |\ \ \ \ \
| * | \ \ \ \ \ auto-mergeKristofer Pettersson2009-07-2911-56/+48
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Auto-merge latest changes from mysql-5.1-bugteamMikael Ronstrom2009-07-291-3/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | removing unused array (compiler warning)Guilhem Bichot2009-07-291-3/+0
| | * | | | | | | | Bug#46354, when defining partitions without subpartition definition after def...Mikael Ronstrom2009-07-291-0/+21
| | |/ / / / / / /
| | * | | | | | | Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted,...Guilhem Bichot2009-07-298-49/+18
| | * | | | | | | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2009-07-283-4/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | BUG#41166 stored function requires "deterministic" if binlog_format is "state...Alfranio Correia2009-07-283-4/+9
| * | | | | | | | | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ...Kristofer Pettersson2009-07-293-43/+93
| |/ / / / / / / /
| * | | | | | | | Automerge.Alexey Kopytov2009-07-281-2/+11
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Manual merge.Alexey Kopytov2009-07-281-2/+11
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Bug #45031: invalid memory reads in my_real_read using protocol Alexey Kopytov2009-07-281-2/+11
| * | | | | | | | | merging with mysql-5.1-bugteam branchSatya B2009-07-2719-169/+283
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | BUG#43046: mixed mode switch to row format with temp table leadLuis Soares2009-07-261-16/+59
| | * | | | | | | | | Bug#43587: Putting event_scheduler=1 in init SQL file crashesDavi Arnaut2009-07-245-29/+54
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Code review for Bug#43587 Putting event_scheduler=1 in init SQL file crashes Konstantin Osipov2009-07-245-27/+54
| | * | | | | | | | | | Merge from 5.0Gleb Shchepa2009-07-2412-111/+107
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | / / / / | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-2410-99/+100
| | | * | | | | | | | Automerge.Alexey Kopytov2009-07-241-0/+5
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2009-07-241-0/+5
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Manual merge.Alexey Kopytov2009-07-241-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | / | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | | * | | | | | | | Bug #46075: Assertion failed: 0, file .\protocol.cc, line 416 Alexey Kopytov2009-07-241-0/+5
| | * | | | | | | | | | Bug#30102: Rename table does corrupt tables with partition files on failureAnurag Shekhar2009-07-242-13/+58
| * | | | | | | | | | | merge 5.0-bugteam to 5.1-bugteamSatya B2009-07-242-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | / / / | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | merge to mysql-5.0-bugteamSatya B2009-07-243-2/+10
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |